diff options
author | Iván Ávalos <avalos@disroot.org> | 2024-04-10 15:29:47 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2024-04-10 15:29:47 -0600 |
commit | e8456ae8ec5960b2119b7cdbcffac6d9ff004c95 (patch) | |
tree | ed5dfe5ff3b9e3491adf15b2abe83e13e2ccb6c0 /src/main/java/org/traccar/handler/events/DriverEventHandler.java | |
parent | 4dec2ef603f078ff3bd18d63d1fbd992537cbb88 (diff) | |
parent | 9a285e59e580994dc9c3f80935f766f3dafdcd46 (diff) | |
download | trackermap-server-e8456ae8ec5960b2119b7cdbcffac6d9ff004c95.tar.gz trackermap-server-e8456ae8ec5960b2119b7cdbcffac6d9ff004c95.tar.bz2 trackermap-server-e8456ae8ec5960b2119b7cdbcffac6d9ff004c95.zip |
Merge tag 'v6.0'
Diffstat (limited to 'src/main/java/org/traccar/handler/events/DriverEventHandler.java')
-rw-r--r-- | src/main/java/org/traccar/handler/events/DriverEventHandler.java | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/main/java/org/traccar/handler/events/DriverEventHandler.java b/src/main/java/org/traccar/handler/events/DriverEventHandler.java index b68327983..31f8d2b4b 100644 --- a/src/main/java/org/traccar/handler/events/DriverEventHandler.java +++ b/src/main/java/org/traccar/handler/events/DriverEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 - 2022 Anton Tananaev (anton@traccar.org) + * Copyright 2017 - 2024 Anton Tananaev (anton@traccar.org) * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,19 +16,12 @@ */ package org.traccar.handler.events; -import io.netty.channel.ChannelHandler; +import jakarta.inject.Inject; import org.traccar.helper.model.PositionUtil; import org.traccar.model.Event; import org.traccar.model.Position; import org.traccar.session.cache.CacheManager; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; -import java.util.Collections; -import java.util.Map; - -@Singleton -@ChannelHandler.Sharable public class DriverEventHandler extends BaseEventHandler { private final CacheManager cacheManager; @@ -39,9 +32,9 @@ public class DriverEventHandler extends BaseEventHandler { } @Override - protected Map<Event, Position> analyzePosition(Position position) { + public void analyzePosition(Position position, Callback callback) { if (!PositionUtil.isLatest(cacheManager, position)) { - return null; + return; } String driverUniqueId = position.getString(Position.KEY_DRIVER_UNIQUE_ID); if (driverUniqueId != null) { @@ -53,10 +46,9 @@ public class DriverEventHandler extends BaseEventHandler { if (!driverUniqueId.equals(oldDriverUniqueId)) { Event event = new Event(Event.TYPE_DRIVER_CHANGED, position); event.set(Position.KEY_DRIVER_UNIQUE_ID, driverUniqueId); - return Collections.singletonMap(event, position); + callback.eventDetected(event); } } - return null; } } |