From 06e3bd8b16da12baafc9a97ba5949b3f7ffb5e07 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 2 Jun 2018 22:12:44 +1200 Subject: Start Netty 4 migration --- src/org/traccar/events/AlertEventHandler.java | 2 ++ src/org/traccar/events/CommandResultEventHandler.java | 2 ++ src/org/traccar/events/DriverEventHandler.java | 2 ++ src/org/traccar/events/FuelDropEventHandler.java | 2 ++ src/org/traccar/events/GeofenceEventHandler.java | 2 ++ src/org/traccar/events/IgnitionEventHandler.java | 2 ++ src/org/traccar/events/MaintenanceEventHandler.java | 2 ++ src/org/traccar/events/MotionEventHandler.java | 2 ++ src/org/traccar/events/OverspeedEventHandler.java | 2 ++ 9 files changed, 18 insertions(+) (limited to 'src/org/traccar/events') diff --git a/src/org/traccar/events/AlertEventHandler.java b/src/org/traccar/events/AlertEventHandler.java index 7db371c70..b14869e72 100644 --- a/src/org/traccar/events/AlertEventHandler.java +++ b/src/org/traccar/events/AlertEventHandler.java @@ -18,11 +18,13 @@ package org.traccar.events; import java.util.Collections; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Event; import org.traccar.model.Position; +@ChannelHandler.Sharable public class AlertEventHandler extends BaseEventHandler { private final boolean ignoreDuplicateAlerts; diff --git a/src/org/traccar/events/CommandResultEventHandler.java b/src/org/traccar/events/CommandResultEventHandler.java index 775aa903f..89ec44190 100644 --- a/src/org/traccar/events/CommandResultEventHandler.java +++ b/src/org/traccar/events/CommandResultEventHandler.java @@ -18,10 +18,12 @@ package org.traccar.events; import java.util.Collections; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.model.Event; import org.traccar.model.Position; +@ChannelHandler.Sharable public class CommandResultEventHandler extends BaseEventHandler { @Override diff --git a/src/org/traccar/events/DriverEventHandler.java b/src/org/traccar/events/DriverEventHandler.java index 39b8eb9c0..c8efd0576 100644 --- a/src/org/traccar/events/DriverEventHandler.java +++ b/src/org/traccar/events/DriverEventHandler.java @@ -19,11 +19,13 @@ package org.traccar.events; import java.util.Collections; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Event; import org.traccar.model.Position; +@ChannelHandler.Sharable public class DriverEventHandler extends BaseEventHandler { @Override diff --git a/src/org/traccar/events/FuelDropEventHandler.java b/src/org/traccar/events/FuelDropEventHandler.java index 2ee3e1a58..31b17d500 100644 --- a/src/org/traccar/events/FuelDropEventHandler.java +++ b/src/org/traccar/events/FuelDropEventHandler.java @@ -15,6 +15,7 @@ */ package org.traccar.events; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Device; @@ -24,6 +25,7 @@ import org.traccar.model.Position; import java.util.Collections; import java.util.Map; +@ChannelHandler.Sharable public class FuelDropEventHandler extends BaseEventHandler { public static final String ATTRIBUTE_FUEL_DROP_THRESHOLD = "fuelDropThreshold"; diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java index 31d82a81e..ea379dbdb 100644 --- a/src/org/traccar/events/GeofenceEventHandler.java +++ b/src/org/traccar/events/GeofenceEventHandler.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.database.GeofenceManager; @@ -28,6 +29,7 @@ import org.traccar.model.Device; import org.traccar.model.Event; import org.traccar.model.Position; +@ChannelHandler.Sharable public class GeofenceEventHandler extends BaseEventHandler { private GeofenceManager geofenceManager; diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java index cc53b216c..a17f15318 100644 --- a/src/org/traccar/events/IgnitionEventHandler.java +++ b/src/org/traccar/events/IgnitionEventHandler.java @@ -19,12 +19,14 @@ package org.traccar.events; import java.util.Collections; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Device; import org.traccar.model.Event; import org.traccar.model.Position; +@ChannelHandler.Sharable public class IgnitionEventHandler extends BaseEventHandler { @Override diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java index 4a6122826..5bebb1baf 100644 --- a/src/org/traccar/events/MaintenanceEventHandler.java +++ b/src/org/traccar/events/MaintenanceEventHandler.java @@ -19,12 +19,14 @@ package org.traccar.events; import java.util.HashMap; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Event; import org.traccar.model.Maintenance; import org.traccar.model.Position; +@ChannelHandler.Sharable public class MaintenanceEventHandler extends BaseEventHandler { @Override diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java index 0c1c4848f..4047b83a4 100644 --- a/src/org/traccar/events/MotionEventHandler.java +++ b/src/org/traccar/events/MotionEventHandler.java @@ -19,6 +19,7 @@ package org.traccar.events; import java.util.Collections; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Device; @@ -28,6 +29,7 @@ import org.traccar.model.Position; import org.traccar.reports.ReportUtils; import org.traccar.reports.model.TripsConfig; +@ChannelHandler.Sharable public class MotionEventHandler extends BaseEventHandler { private TripsConfig tripsConfig; diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java index 4ebe43fda..aed79a2f5 100644 --- a/src/org/traccar/events/OverspeedEventHandler.java +++ b/src/org/traccar/events/OverspeedEventHandler.java @@ -19,6 +19,7 @@ package org.traccar.events; import java.util.Collections; import java.util.Map; +import io.netty.channel.ChannelHandler; import org.traccar.BaseEventHandler; import org.traccar.Context; import org.traccar.model.Device; @@ -27,6 +28,7 @@ import org.traccar.model.Event; import org.traccar.model.Geofence; import org.traccar.model.Position; +@ChannelHandler.Sharable public class OverspeedEventHandler extends BaseEventHandler { public static final String ATTRIBUTE_SPEED_LIMIT = "speedLimit"; -- cgit v1.2.3