Make Overspeed and Motion events handlers singleton and move some code to function

2 files changed, 36 insertions, 38 deletions

diff --git a/src/org/traccar/events/MotionEventHandler.java b/src/org/traccar/events/MotionEventHandler.java
index 1a8cb0ef8..b20a11999 100644
--- a/src/org/traccar/events/MotionEventHandler.java
+++ b/src/org/traccar/events/MotionEventHandler.java
@@ -32,11 +32,20 @@ public class MotionEventHandler extends BaseEventHandler {
 
     private TripsConfig tripsConfig;
 
-    public MotionEventHandler() {
-        tripsConfig = ReportUtils.initTripsConfig();
+    public MotionEventHandler(TripsConfig tripsConfig) {
+        this.tripsConfig = tripsConfig;
     }
 
-    public static Event updateMotionState(DeviceState deviceState, TripsConfig tripsConfig) {
+    private Event newEvent(DeviceState deviceState, boolean newMotion) {
+        String eventType = newMotion ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
+        Event event = new Event(eventType, deviceState.getMotionPosition().getDeviceId(),
+                deviceState.getMotionPosition().getId());
+        deviceState.setMotionState(newMotion);
+        deviceState.setMotionPosition(null);
+        return event;
+    }
+
+    public Event updateMotionState(DeviceState deviceState) {
         Event result = null;
         if (deviceState.getMotionState() != null && deviceState.getMotionPosition() != null) {
             boolean newMotion = !deviceState.getMotionState();
@@ -45,16 +54,13 @@ public class MotionEventHandler extends BaseEventHandler {
             long motionTime = motionPosition.getFixTime().getTime()
                     + (newMotion ? tripsConfig.getMinimalTripDuration() : tripsConfig.getMinimalParkingDuration());
             if (motionTime <= currentTime) {
-                String eventType = newMotion ? Event.TYPE_DEVICE_MOVING : Event.TYPE_DEVICE_STOPPED;
-                result = new Event(eventType, motionPosition.getDeviceId(), motionPosition.getId());
-                deviceState.setMotionState(newMotion);
-                deviceState.setMotionPosition(null);
+                result = newEvent(deviceState, newMotion);
             }
         }
         return result;
     }
 
-    public static Event updateMotionState(DeviceState deviceState, Position position, TripsConfig tripsConfig) {
+    public Event updateMotionState(DeviceState deviceState, Position position) {
         Event result = null;
         Boolean oldMotion = deviceState.getMotionState();
 
@@ -75,17 +81,11 @@ public class MotionEventHandler extends BaseEventHandler {
             if (newMotion) {
                 if (motionTime + tripsConfig.getMinimalTripDuration() <= currentTime
                         || distance >= tripsConfig.getMinimalTripDistance()) {
-                    result = new Event(Event.TYPE_DEVICE_MOVING, motionPosition.getDeviceId(),
-                            motionPosition.getId());
-                    deviceState.setMotionState(true);
-                    deviceState.setMotionPosition(null);
+                    result = newEvent(deviceState, newMotion);
                 }
             } else {
                 if (motionTime + tripsConfig.getMinimalParkingDuration() <= currentTime) {
-                    result = new Event(Event.TYPE_DEVICE_STOPPED, motionPosition.getDeviceId(),
-                            motionPosition.getId());
-                    deviceState.setMotionState(false);
-                    deviceState.setMotionPosition(null);
+                    result = newEvent(deviceState, newMotion);
                 }
             }
         }
@@ -110,7 +110,7 @@ public class MotionEventHandler extends BaseEventHandler {
         if (deviceState.getMotionState() == null) {
             deviceState.setMotionState(position.getBoolean(Position.KEY_MOTION));
         } else {
-            result = updateMotionState(deviceState, position, tripsConfig);
+            result = updateMotionState(deviceState, position);
         }
         Context.getDeviceManager().setDeviceState(deviceId, deviceState);
         if (result != null) {
diff --git a/src/org/traccar/events/OverspeedEventHandler.java b/src/org/traccar/events/OverspeedEventHandler.java
index f0bf8a032..953af6b33 100644
--- a/src/org/traccar/events/OverspeedEventHandler.java
+++ b/src/org/traccar/events/OverspeedEventHandler.java
@@ -32,13 +32,22 @@ public class OverspeedEventHandler extends BaseEventHandler {
     private boolean notRepeat;
     private long minimalDuration;
 
-    public OverspeedEventHandler() {
-        notRepeat = Context.getConfig().getBoolean("event.overspeed.notRepeat");
-        minimalDuration = Context.getConfig().getLong("event.overspeed.minimalDuration") * 1000;
+    public OverspeedEventHandler(long minimalDuration, boolean notRepeat) {
+        this.notRepeat = notRepeat;
+        this.minimalDuration = minimalDuration;
     }
 
-    public static Event updateOverspeedState(DeviceState deviceState, double speedLimit,
-            long minimalDuration, boolean notRepeat) {
+    private Event newEvent(DeviceState deviceState, double speedLimit) {
+        Event event = new Event(Event.TYPE_DEVICE_OVERSPEED, deviceState.getOverspeedPosition().getDeviceId(),
+                deviceState.getOverspeedPosition().getId());
+        event.set("speed", deviceState.getOverspeedPosition().getSpeed());
+        event.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
+        deviceState.setOverspeedState(notRepeat);
+        deviceState.setOverspeedPosition(null);
+        return event;
+    }
+
+    public Event updateOverspeedState(DeviceState deviceState, double speedLimit) {
         Event result = null;
         if (deviceState.getOverspeedState() != null && !deviceState.getOverspeedState()
                 && deviceState.getOverspeedPosition() != null && speedLimit != 0) {
@@ -46,19 +55,13 @@ public class OverspeedEventHandler extends BaseEventHandler {
             Position overspeedPosition = deviceState.getOverspeedPosition();
             long overspeedTime = overspeedPosition.getFixTime().getTime();
             if (overspeedTime + minimalDuration <= currentTime) {
-                result = new Event(Event.TYPE_DEVICE_OVERSPEED, overspeedPosition.getDeviceId(),
-                        overspeedPosition.getId());
-                result.set("speed", overspeedPosition.getSpeed());
-                result.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
-                deviceState.setOverspeedState(notRepeat);
-                deviceState.setOverspeedPosition(null);
+                result = newEvent(deviceState, speedLimit);
             }
         }
         return result;
     }
 
-    public static Event updateOverspeedState(DeviceState deviceState, Position position, double speedLimit,
-            long minimalOverspeedDuration, boolean notRepeat) {
+    public Event updateOverspeedState(DeviceState deviceState, Position position, double speedLimit) {
         Event result = null;
 
         Boolean oldOverspeed = deviceState.getOverspeedState();
@@ -78,13 +81,8 @@ public class OverspeedEventHandler extends BaseEventHandler {
         Position overspeedPosition = deviceState.getOverspeedPosition();
         if (overspeedPosition != null) {
             long overspeedTime = overspeedPosition.getFixTime().getTime();
-            if (newOverspeed && overspeedTime + minimalOverspeedDuration <= currentTime) {
-                result = new Event(Event.TYPE_DEVICE_OVERSPEED, overspeedPosition.getDeviceId(),
-                        overspeedPosition.getId());
-                result.set("speed", overspeedPosition.getSpeed());
-                result.set(ATTRIBUTE_SPEED_LIMIT, speedLimit);
-                deviceState.setOverspeedState(notRepeat);
-                deviceState.setOverspeedPosition(null);
+            if (newOverspeed && overspeedTime + minimalDuration <= currentTime) {
+                result = newEvent(deviceState, speedLimit);
             }
         }
         return result;
@@ -113,7 +111,7 @@ public class OverspeedEventHandler extends BaseEventHandler {
         if (deviceState.getOverspeedState() == null) {
             deviceState.setOverspeedState(position.getSpeed() > speedLimit);
         } else {
-            result = updateOverspeedState(deviceState, position, speedLimit, minimalDuration, notRepeat);
+            result = updateOverspeedState(deviceState, position, speedLimit);
         }
 
         Context.getDeviceManager().setDeviceState(deviceId, deviceState);