diff options
author | Anton Tananaev <anton@traccar.org> | 2024-03-30 18:46:37 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2024-03-30 18:46:37 -0700 |
commit | f84e2710e05660822633ec9e61cde44c03a42d7e (patch) | |
tree | 0d68bee50cc42ed206d270275dfb32b4b69c5186 /src/main/java/org/traccar/handler/events/MediaEventHandler.java | |
parent | ee996425221ca64fdf00777d9035cedc6dccfa43 (diff) | |
download | trackermap-server-f84e2710e05660822633ec9e61cde44c03a42d7e.tar.gz trackermap-server-f84e2710e05660822633ec9e61cde44c03a42d7e.tar.bz2 trackermap-server-f84e2710e05660822633ec9e61cde44c03a42d7e.zip |
Refactor position and event handlers
Diffstat (limited to 'src/main/java/org/traccar/handler/events/MediaEventHandler.java')
-rw-r--r-- | src/main/java/org/traccar/handler/events/MediaEventHandler.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/main/java/org/traccar/handler/events/MediaEventHandler.java b/src/main/java/org/traccar/handler/events/MediaEventHandler.java index 52d8e6961..2745296c4 100644 --- a/src/main/java/org/traccar/handler/events/MediaEventHandler.java +++ b/src/main/java/org/traccar/handler/events/MediaEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Anton Tananaev (anton@traccar.org) + * Copyright 2022 - 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,18 +15,12 @@ */ package org.traccar.handler.events; -import io.netty.channel.ChannelHandler; +import jakarta.inject.Inject; import org.traccar.model.Event; import org.traccar.model.Position; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; -import java.util.Map; -import java.util.stream.Collectors; import java.util.stream.Stream; -@Singleton -@ChannelHandler.Sharable public class MediaEventHandler extends BaseEventHandler { @Inject @@ -34,8 +28,8 @@ public class MediaEventHandler extends BaseEventHandler { } @Override - protected Map<Event, Position> analyzePosition(Position position) { - return Stream.of(Position.KEY_IMAGE, Position.KEY_VIDEO, Position.KEY_AUDIO) + public void analyzePosition(Position position, Callback callback) { + Stream.of(Position.KEY_IMAGE, Position.KEY_VIDEO, Position.KEY_AUDIO) .filter(position::hasAttribute) .map(type -> { Event event = new Event(Event.TYPE_MEDIA, position); @@ -43,7 +37,7 @@ public class MediaEventHandler extends BaseEventHandler { event.set("file", position.getString(type)); return event; }) - .collect(Collectors.toMap(event -> event, event -> position)); + .forEach(callback::eventDetected); } } |