ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Split switch event data into multiple classes

Browse source
This commit is contained in:
Ziver Koc 2021-01-02 04:25:04 +01:00
parent 4499824965
commit 6214c01157
23 changed files with 259 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/hal-netscan/src/se/hal/plugin/netscan/NetScanController.java
View file

@ -2,7 +2,8 @@ package se.hal.plugin.netscan;
import se.hal.HalContext;
import se.hal.intf.*;
import se.hal.struct.devicedata.SwitchEventData;
import se.hal.struct.devicedata.AvailabilityEventData;
import se.hal.struct.devicedata.OnOffEventData;
import zutil.InetUtil;
import zutil.log.LogUtil;
import zutil.net.InetScanner;
@ -27,7 +28,7 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
private ScheduledExecutorService executor;
private HalEventReportListener listener;
/** A register and a cache of previous state **/
private HashMap<NetworkDevice,SwitchEventData> devices = new HashMap<>();
private HashMap<NetworkDevice, AvailabilityEventData> devices = new HashMap<>();
@ -61,9 +62,9 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
@Override
public void run() {
try(MultiCommandExecutor executor = new MultiCommandExecutor()){
for (Map.Entry<NetworkDevice,SwitchEventData> entry : devices.entrySet()) {
for (Map.Entry<NetworkDevice, AvailabilityEventData> entry : devices.entrySet()) {
NetworkDevice device = entry.getKey();
SwitchEventData prevData = entry.getValue();
AvailabilityEventData prevData = entry.getValue();
if (listener != null) {
// We ping two times to increase reliability
boolean ping = false;
@ -72,10 +73,10 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
ping |= InetScanner.isReachable(device.getHost(), executor);
// Should we report?
if (prevData == null || prevData.isOn() != ping) {
SwitchEventData newData = new SwitchEventData(ping, System.currentTimeMillis());
if (prevData == null || prevData.isAvailable() != ping) {
AvailabilityEventData newData = new AvailabilityEventData(ping, System.currentTimeMillis());
entry.setValue(newData);
logger.fine("IP "+device.getHost() +" state has changed to "+ newData.isOn());
logger.fine("IP " + device.getHost() + " state has changed to " + newData);
listener.reportReceived(device, newData);
}
}
@ -90,7 +91,7 @@ public class NetScanController implements HalEventController, HalAutoScannableCo
if (listener != null)
listener.reportReceived(
new NetworkDevice(ip.getHostAddress()),
new SwitchEventData(true, System.currentTimeMillis()));
new OnOffEventData(true, System.currentTimeMillis()));
}

4
plugins/hal-netscan/src/se/hal/plugin/netscan/NetworkDevice.java
View file

@ -3,7 +3,7 @@ package se.hal.plugin.netscan;
import se.hal.intf.HalEventConfig;
import se.hal.intf.HalEventController;
import se.hal.intf.HalEventData;
import se.hal.struct.devicedata.SwitchEventData;
import se.hal.struct.devicedata.OnOffEventData;
import zutil.ui.Configurator;
public class NetworkDevice implements HalEventConfig {
@ -40,6 +40,6 @@ public class NetworkDevice implements HalEventConfig {
}
@Override
public Class<? extends HalEventData> getEventDataClass() {
return SwitchEventData.class;
return OnOffEventData.class;
}
}