1 files changed, 8 insertions, 24 deletions
diff --git a/src/main/java/org/traccar/handler/events/BaseEventHandler.java b/src/main/java/org/traccar/handler/events/BaseEventHandler.java
index 4a4fb40ff..009c83145 100644
--- a/src/main/java/org/traccar/handler/events/BaseEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/BaseEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 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.
@@ -15,33 +15,17 @@
  */
 package org.traccar.handler.events;
 
-import java.util.Map;
-
-import org.traccar.BaseDataHandler;
-import org.traccar.database.NotificationManager;
 import org.traccar.model.Event;
 import org.traccar.model.Position;
 
-import jakarta.inject.Inject;
-
-public abstract class BaseEventHandler extends BaseDataHandler {
-
-    private NotificationManager notificationManager;
+public abstract class BaseEventHandler {
 
-    @Inject
-    public void setNotificationManager(NotificationManager notificationManager) {
-        this.notificationManager = notificationManager;
+    public interface Callback {
+        void eventDetected(Event event);
     }
 
-    @Override
-    protected Position handlePosition(Position position) {
-        Map<Event, Position> events = analyzePosition(position);
-        if (events != null && !events.isEmpty()) {
-            notificationManager.updateEvents(events);
-        }
-        return position;
-    }
-
-    protected abstract Map<Event, Position> analyzePosition(Position position);
-
+    /**
+     * Event handlers should be processed synchronously.
+     */
+    public abstract void analyzePosition(Position position, Callback callback);
 }