From f84e2710e05660822633ec9e61cde44c03a42d7e Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 30 Mar 2024 18:46:37 -0700
Subject: Refactor position and event handlers

---
 .../handler/events/MaintenanceEventHandler.java       | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java')

diff --git a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
index 2fa2e8869..573ad4ad6 100644
--- a/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
+++ b/src/main/java/org/traccar/handler/events/MaintenanceEventHandler.java
@@ -16,20 +16,12 @@
  */
 package org.traccar.handler.events;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import io.netty.channel.ChannelHandler;
+import jakarta.inject.Inject;
 import org.traccar.model.Event;
 import org.traccar.model.Maintenance;
 import org.traccar.model.Position;
 import org.traccar.session.cache.CacheManager;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Singleton;
-
-@Singleton
-@ChannelHandler.Sharable
 public class MaintenanceEventHandler extends BaseEventHandler {
 
     private final CacheManager cacheManager;
@@ -40,13 +32,12 @@ public class MaintenanceEventHandler extends BaseEventHandler {
     }
 
     @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
+    public void analyzePosition(Position position, Callback callback) {
         Position lastPosition = cacheManager.getPosition(position.getDeviceId());
         if (lastPosition == null || position.getFixTime().compareTo(lastPosition.getFixTime()) < 0) {
-            return null;
+            return;
         }
 
-        Map<Event, Position> events = new HashMap<>();
         for (Maintenance maintenance : cacheManager.getDeviceObjects(position.getDeviceId(), Maintenance.class)) {
             if (maintenance.getPeriod() != 0) {
                 double oldValue = getValue(lastPosition, maintenance.getType());
@@ -58,13 +49,11 @@ public class MaintenanceEventHandler extends BaseEventHandler {
                         Event event = new Event(Event.TYPE_MAINTENANCE, position);
                         event.setMaintenanceId(maintenance.getId());
                         event.set(maintenance.getType(), newValue);
-                        events.put(event, position);
+                        callback.eventDetected(event);
                     }
                 }
             }
         }
-
-        return events;
     }
 
     private double getValue(Position position, String type) {
-- 
cgit v1.2.3