Move events handler classes

10 files changed, 0 insertions, 744 deletions

diff --git a/src/org/traccar/events/AlertEventHandler.java b/src/org/traccar/events/AlertEventHandler.java
deleted file mode 100644
index b14869e72..000000000
--- a/src/org/traccar/events/AlertEventHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2016 - 2018 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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;
-
-    public AlertEventHandler() {
-        ignoreDuplicateAlerts = Context.getConfig().getBoolean("event.ignoreDuplicateAlerts");
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Object alarm = position.getAttributes().get(Position.KEY_ALARM);
-        if (alarm != null) {
-            boolean ignoreAlert = false;
-            if (ignoreDuplicateAlerts) {
-                Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-                if (lastPosition != null && alarm.equals(lastPosition.getAttributes().get(Position.KEY_ALARM))) {
-                    ignoreAlert = true;
-                }
-            }
-            if (!ignoreAlert) {
-                Event event = new Event(Event.TYPE_ALARM, position.getDeviceId(), position.getId());
-                event.set(Position.KEY_ALARM, (String) alarm);
-                return Collections.singletonMap(event, position);
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/events/CommandResultEventHandler.java b/src/org/traccar/events/CommandResultEventHandler.java
deleted file mode 100644
index 89ec44190..000000000
--- a/src/org/traccar/events/CommandResultEventHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2016 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Object commandResult = position.getAttributes().get(Position.KEY_RESULT);
-        if (commandResult != null) {
-            Event event = new Event(Event.TYPE_COMMAND_RESULT, position.getDeviceId(), position.getId());
-            event.set(Position.KEY_RESULT, (String) commandResult);
-            return Collections.singletonMap(event, position);
-        }
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/events/DriverEventHandler.java b/src/org/traccar/events/DriverEventHandler.java
deleted file mode 100644
index c8efd0576..000000000
--- a/src/org/traccar/events/DriverEventHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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
-    protected Map<Event, Position> analyzePosition(Position position) {
-        if (!Context.getIdentityManager().isLatestPosition(position)) {
-            return null;
-        }
-        String driverUniqueId = position.getString(Position.KEY_DRIVER_UNIQUE_ID);
-        if (driverUniqueId != null) {
-            String oldDriverUniqueId = null;
-            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-            if (lastPosition != null) {
-                oldDriverUniqueId = lastPosition.getString(Position.KEY_DRIVER_UNIQUE_ID);
-            }
-            if (!driverUniqueId.equals(oldDriverUniqueId)) {
-                Event event = new Event(Event.TYPE_DRIVER_CHANGED, position.getDeviceId(), position.getId());
-                event.set(Position.KEY_DRIVER_UNIQUE_ID, driverUniqueId);
-                return Collections.singletonMap(event, position);
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/events/FuelDropEventHandler.java b/src/org/traccar/events/FuelDropEventHandler.java
deleted file mode 100644
index 31b17d500..000000000
--- a/src/org/traccar/events/FuelDropEventHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.events;
-
-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;
-
-import java.util.Collections;
-import java.util.Map;
-
-@ChannelHandler.Sharable
-public class FuelDropEventHandler extends BaseEventHandler {
-
-    public static final String ATTRIBUTE_FUEL_DROP_THRESHOLD = "fuelDropThreshold";
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-
-        Device device = Context.getIdentityManager().getById(position.getDeviceId());
-        if (device == null) {
-            return null;
-        }
-        if (!Context.getIdentityManager().isLatestPosition(position)) {
-            return null;
-        }
-
-        double fuelDropThreshold = Context.getDeviceManager()
-                .lookupAttributeDouble(device.getId(), ATTRIBUTE_FUEL_DROP_THRESHOLD, 0, false);
-
-        if (fuelDropThreshold > 0) {
-            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-            if (position.getAttributes().containsKey(Position.KEY_FUEL_LEVEL)
-                    && lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_FUEL_LEVEL)) {
-
-                double drop = lastPosition.getDouble(Position.KEY_FUEL_LEVEL)
-                        - position.getDouble(Position.KEY_FUEL_LEVEL);
-                if (drop >= fuelDropThreshold) {
-                    Event event = new Event(Event.TYPE_DEVICE_FUEL_DROP, position.getDeviceId(), position.getId());
-                    event.set(ATTRIBUTE_FUEL_DROP_THRESHOLD, fuelDropThreshold);
-                    return Collections.singletonMap(event, position);
-                }
-            }
-        }
-
-        return null;
-    }
-
-}
diff --git a/src/org/traccar/events/GeofenceEventHandler.java b/src/org/traccar/events/GeofenceEventHandler.java
deleted file mode 100644
index 313553195..000000000
--- a/src/org/traccar/events/GeofenceEventHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2016 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.events;
-
-import java.util.ArrayList;
-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;
-import org.traccar.model.Calendar;
-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;
-
-    public GeofenceEventHandler() {
-        geofenceManager = Context.getGeofenceManager();
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Device device = Context.getIdentityManager().getById(position.getDeviceId());
-        if (device == null) {
-            return null;
-        }
-        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
-            return null;
-        }
-
-        List<Long> currentGeofences = geofenceManager.getCurrentDeviceGeofences(position);
-        List<Long> oldGeofences = new ArrayList<>();
-        if (device.getGeofenceIds() != null) {
-            oldGeofences.addAll(device.getGeofenceIds());
-        }
-        List<Long> newGeofences = new ArrayList<>(currentGeofences);
-        newGeofences.removeAll(oldGeofences);
-        oldGeofences.removeAll(currentGeofences);
-
-        device.setGeofenceIds(currentGeofences);
-
-        Map<Event, Position> events = new HashMap<>();
-        for (long geofenceId : oldGeofences) {
-            long calendarId = geofenceManager.getById(geofenceId).getCalendarId();
-            Calendar calendar = calendarId != 0 ? Context.getCalendarManager().getById(calendarId) : null;
-            if (calendar == null || calendar.checkMoment(position.getFixTime())) {
-                Event event = new Event(Event.TYPE_GEOFENCE_EXIT, position.getDeviceId(), position.getId());
-                event.setGeofenceId(geofenceId);
-                events.put(event, position);
-            }
-        }
-        for (long geofenceId : newGeofences) {
-            long calendarId = geofenceManager.getById(geofenceId).getCalendarId();
-            Calendar calendar = calendarId != 0 ? Context.getCalendarManager().getById(calendarId) : null;
-            if (calendar == null || calendar.checkMoment(position.getFixTime())) {
-                Event event = new Event(Event.TYPE_GEOFENCE_ENTER, position.getDeviceId(), position.getId());
-                event.setGeofenceId(geofenceId);
-                events.put(event, position);
-            }
-        }
-        return events;
-    }
-}
diff --git a/src/org/traccar/events/IgnitionEventHandler.java b/src/org/traccar/events/IgnitionEventHandler.java
deleted file mode 100644
index a17f15318..000000000
--- a/src/org/traccar/events/IgnitionEventHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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
-    protected Map<Event, Position> analyzePosition(Position position) {
-        Device device = Context.getIdentityManager().getById(position.getDeviceId());
-        if (device == null || !Context.getIdentityManager().isLatestPosition(position)) {
-            return null;
-        }
-
-        Map<Event, Position> result = null;
-
-        if (position.getAttributes().containsKey(Position.KEY_IGNITION)) {
-            boolean ignition = position.getBoolean(Position.KEY_IGNITION);
-
-            Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-            if (lastPosition != null && lastPosition.getAttributes().containsKey(Position.KEY_IGNITION)) {
-                boolean oldIgnition = lastPosition.getBoolean(Position.KEY_IGNITION);
-
-                if (ignition && !oldIgnition) {
-                    result = Collections.singletonMap(
-                            new Event(Event.TYPE_IGNITION_ON, position.getDeviceId(), position.getId()), position);
-                } else if (!ignition && oldIgnition) {
-                    result = Collections.singletonMap(
-                            new Event(Event.TYPE_IGNITION_OFF, position.getDeviceId(), position.getId()), position);
-                }
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/src/org/traccar/events/MaintenanceEventHandler.java b/src/org/traccar/events/MaintenanceEventHandler.java
deleted file mode 100644
index 5bebb1baf..000000000
--- a/src/org/traccar/events/MaintenanceEventHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 - 2018 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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
-    protected Map<Event, Position> analyzePosition(Position position) {
-        if (Context.getIdentityManager().getById(position.getDeviceId()) == null
-                || !Context.getIdentityManager().isLatestPosition(position)) {
-            return null;
-        }
-
-        Position lastPosition = Context.getIdentityManager().getLastPosition(position.getDeviceId());
-        if (lastPosition == null) {
-            return null;
-        }
-
-        Map<Event, Position> events = new HashMap<>();
-        for (long maintenanceId : Context.getMaintenancesManager().getAllDeviceItems(position.getDeviceId())) {
-            Maintenance maintenance = Context.getMaintenancesManager().getById(maintenanceId);
-            if (maintenance.getPeriod() != 0) {
-                double oldValue = lastPosition.getDouble(maintenance.getType());
-                double newValue = position.getDouble(maintenance.getType());
-                if (oldValue != 0.0 && newValue != 0.0
-                        && (long) ((oldValue - maintenance.getStart()) / maintenance.getPeriod())
-                        < (long) ((newValue - maintenance.getStart()) / maintenance.getPeriod())) {
-                    Event event = new Event(Event.TYPE_MAINTENANCE, position.getDeviceId(), position.getId());
-                    event.setMaintenanceId(maintenanceId);
-                    event.set(maintenance.getType(), newValue);
-                    events.put(event, position);
-                }
-            }
-        }
-
-        return events;
-    }
-
-}
diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
deleted file mode 100644
index 4047b83a4..000000000
--- a/src/org/traccar/events/MotionEventHandler.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2016 - 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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.DeviceState;
-import org.traccar.model.Event;
-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;
-
-    public MotionEventHandler(TripsConfig tripsConfig) {
-        this.tripsConfig = tripsConfig;
-    }
-
-    private Map<Event, Position> newEvent(DeviceState deviceState, boolean newMotion) {
-        String eventType = newMotion ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
-        Position position = deviceState.getMotionPosition();
-        Event event = new Event(eventType, position.getDeviceId(), position.getId());
-        deviceState.setMotionState(newMotion);
-        deviceState.setMotionPosition(null);
-        return Collections.singletonMap(event, position);
-    }
-
-    public Map<Event, Position> updateMotionState(DeviceState deviceState) {
-        Map<Event, Position> result = null;
-        if (deviceState.getMotionState() != null && deviceState.getMotionPosition() != null) {
-            boolean newMotion = !deviceState.getMotionState();
-            Position motionPosition = deviceState.getMotionPosition();
-            long currentTime = System.currentTimeMillis();
-            long motionTime = motionPosition.getFixTime().getTime()
-                    + (newMotion ? tripsConfig.getMinimalTripDuration() : tripsConfig.getMinimalParkingDuration());
-            if (motionTime <= currentTime) {
-                result = newEvent(deviceState, newMotion);
-            }
-        }
-        return result;
-    }
-
-    public Map<Event, Position> updateMotionState(DeviceState deviceState, Position position) {
-        return updateMotionState(deviceState, position, position.getBoolean(Position.KEY_MOTION));
-    }
-
-    public Map<Event, Position> updateMotionState(DeviceState deviceState, Position position, boolean newMotion) {
-        Map<Event, Position> result = null;
-        Boolean oldMotion = deviceState.getMotionState();
-
-        long currentTime = position.getFixTime().getTime();
-        if (newMotion != oldMotion) {
-            if (deviceState.getMotionPosition() == null) {
-                deviceState.setMotionPosition(position);
-            }
-        } else {
-            deviceState.setMotionPosition(null);
-        }
-
-        Position motionPosition = deviceState.getMotionPosition();
-        if (motionPosition != null) {
-            long motionTime = motionPosition.getFixTime().getTime();
-            double distance = ReportUtils.calculateDistance(motionPosition, position, false);
-            Boolean ignition = null;
-            if (tripsConfig.getUseIgnition()
-                    && position.getAttributes().containsKey(Position.KEY_IGNITION)) {
-                ignition = position.getBoolean(Position.KEY_IGNITION);
-            }
-            if (newMotion) {
-                if (motionTime + tripsConfig.getMinimalTripDuration() <= currentTime
-                        || distance >= tripsConfig.getMinimalTripDistance()) {
-                    result = newEvent(deviceState, newMotion);
-                }
-            } else {
-                if (motionTime + tripsConfig.getMinimalParkingDuration() <= currentTime
-                        || ignition != null && !ignition) {
-                    result = newEvent(deviceState, newMotion);
-                }
-            }
-        }
-        return result;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-
-        long deviceId = position.getDeviceId();
-        Device device = Context.getIdentityManager().getById(deviceId);
-        if (device == null) {
-            return null;
-        }
-        if (!Context.getIdentityManager().isLatestPosition(position)
-                || !tripsConfig.getProcessInvalidPositions() && !position.getValid()) {
-            return null;
-        }
-
-        Map<Event, Position> result = null;
-        DeviceState deviceState = Context.getDeviceManager().getDeviceState(deviceId);
-
-        if (deviceState.getMotionState() == null) {
-            deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
-        } else {
-            result = updateMotionState(deviceState, position);
-        }
-        Context.getDeviceManager().setDeviceState(deviceId, deviceState);
-        return result;
-    }
-
-}
diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
deleted file mode 100644
index 4f9a35793..000000000
--- a/src/org/traccar/events/OverspeedEventHandler.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org)
- * Copyright 2018 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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.DeviceState;
-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";
-
-    private boolean notRepeat;
-    private boolean preferLowest;
-    private long minimalDuration;
-
-    public OverspeedEventHandler(long minimalDuration, boolean notRepeat, boolean preferLowest) {
-        this.notRepeat = notRepeat;
-        this.minimalDuration = minimalDuration;
-        this.preferLowest = preferLowest;
-    }
-
-    private Map<Event, Position> newEvent(DeviceState deviceState, double speedLimit) {
-        Position position = deviceState.getOverspeedPosition();
-        Event event = new Event(Event.TYPE_DEVICE_OVERSPEED, position.getDeviceId(), position.getId());
-        event.set("speed", deviceState.getOverspeedPosition().getSpeed());
-        event.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
-        event.setGeofenceId(deviceState.getOverspeedGeofenceId());
-        deviceState.setOverspeedState(notRepeat);
-        deviceState.setOverspeedPosition(null);
-        deviceState.setOverspeedGeofenceId(0);
-        return Collections.singletonMap(event, position);
-    }
-
-    public Map<Event, Position> updateOverspeedState(DeviceState deviceState, double speedLimit) {
-        Map<Event, Position> result = null;
-        if (deviceState.getOverspeedState() != null && !deviceState.getOverspeedState()
-                && deviceState.getOverspeedPosition() != null && speedLimit != 0) {
-            long currentTime = System.currentTimeMillis();
-            Position overspeedPosition = deviceState.getOverspeedPosition();
-            long overspeedTime = overspeedPosition.getFixTime().getTime();
-            if (overspeedTime + minimalDuration <= currentTime) {
-                result = newEvent(deviceState, speedLimit);
-            }
-        }
-        return result;
-    }
-
-    public Map<Event, Position> updateOverspeedState(
-            DeviceState deviceState, Position position, double speedLimit, long geofenceId) {
-        Map<Event, Position> result = null;
-
-        Boolean oldOverspeed = deviceState.getOverspeedState();
-
-        long currentTime = position.getFixTime().getTime();
-        boolean newOverspeed = position.getSpeed() > speedLimit;
-        if (newOverspeed && !oldOverspeed) {
-            if (deviceState.getOverspeedPosition() == null) {
-                deviceState.setOverspeedPosition(position);
-                deviceState.setOverspeedGeofenceId(geofenceId);
-            }
-        } else if (oldOverspeed && !newOverspeed) {
-            deviceState.setOverspeedState(false);
-            deviceState.setOverspeedPosition(null);
-            deviceState.setOverspeedGeofenceId(0);
-        } else {
-            deviceState.setOverspeedPosition(null);
-            deviceState.setOverspeedGeofenceId(0);
-        }
-        Position overspeedPosition = deviceState.getOverspeedPosition();
-        if (overspeedPosition != null) {
-            long overspeedTime = overspeedPosition.getFixTime().getTime();
-            if (newOverspeed && overspeedTime + minimalDuration <= currentTime) {
-                result = newEvent(deviceState, speedLimit);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    protected Map<Event, Position> analyzePosition(Position position) {
-
-        long deviceId = position.getDeviceId();
-        Device device = Context.getIdentityManager().getById(deviceId);
-        if (device == null) {
-            return null;
-        }
-        if (!Context.getIdentityManager().isLatestPosition(position) || !position.getValid()) {
-            return null;
-        }
-
-        double speedLimit = Context.getDeviceManager().lookupAttributeDouble(deviceId, ATTRIBUTE_SPEED_LIMIT, 0, false);
-
-        double geofenceSpeedLimit = 0;
-        long overspeedGeofenceId = 0;
-
-        if (Context.getGeofenceManager() != null && device.getGeofenceIds() != null) {
-            for (long geofenceId : device.getGeofenceIds()) {
-                Geofence geofence = Context.getGeofenceManager().getById(geofenceId);
-                if (geofence != null) {
-                    double currentSpeedLimit = geofence.getDouble(ATTRIBUTE_SPEED_LIMIT);
-                    if (currentSpeedLimit > 0 && geofenceSpeedLimit == 0
-                            || preferLowest && currentSpeedLimit < geofenceSpeedLimit
-                            || !preferLowest && currentSpeedLimit > geofenceSpeedLimit) {
-                        geofenceSpeedLimit = currentSpeedLimit;
-                        overspeedGeofenceId = geofenceId;
-                    }
-                }
-            }
-        }
-        if (geofenceSpeedLimit > 0) {
-            speedLimit = geofenceSpeedLimit;
-        }
-
-        if (speedLimit == 0) {
-            return null;
-        }
-
-        Map<Event, Position> result = null;
-        DeviceState deviceState = Context.getDeviceManager().getDeviceState(deviceId);
-
-        if (deviceState.getOverspeedState() == null) {
-            deviceState.setOverspeedState(position.getSpeed() > speedLimit);
-            deviceState.setOverspeedGeofenceId(position.getSpeed() > speedLimit ? overspeedGeofenceId : 0);
-        } else {
-            result = updateOverspeedState(deviceState, position, speedLimit, overspeedGeofenceId);
-        }
-
-        Context.getDeviceManager().setDeviceState(deviceId, deviceState);
-        return result;
-    }
-
-}
diff --git a/src/org/traccar/events/TextMessageEventHandler.java b/src/org/traccar/events/TextMessageEventHandler.java
deleted file mode 100644
index be4a193a7..000000000
--- a/src/org/traccar/events/TextMessageEventHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.events;
-
-import org.traccar.Context;
-import org.traccar.model.Device;
-import org.traccar.model.Event;
-
-public final class TextMessageEventHandler {
-
-    private TextMessageEventHandler() {
-    }
-
-    public static void handleTextMessage(String phone, String message) {
-        Device device = Context.getDeviceManager().getDeviceByPhone(phone);
-        if (device != null && Context.getNotificationManager() != null) {
-            Event event = new Event(Event.TYPE_TEXT_MESSAGE, device.getId());
-            event.set("message", message);
-            Context.getNotificationManager().updateEvent(event, null);
-        }
-    }
-
-}