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

Refactoring of of inheritance structure, ControllerManagers will now also be able to be provided through plugins

Browse source
This commit is contained in:
Ziver Koc 2021-03-16 22:24:43 +01:00
parent 28bc108921
commit c0188cd5cc
73 changed files with 1083 additions and 991 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/hal-mqtt/src/se/hal/plugin/mqtt/HalMqttController.java
View file

@ -46,7 +46,7 @@ public class HalMqttController implements HalAutoScannableController, MqttSubscr
private MqttBroker mqttBroker;
private HashMap<String, HalMqttDeviceConfig> topics = new HashMap<>();
private HalEventReportListener eventListener;
private HalDeviceReportListener eventListener;
// --------------------------
// Lifecycle methods
@ -116,18 +116,18 @@ public class HalMqttController implements HalAutoScannableController, MqttSubscr
// --------------------------
@Override
public void register(HalEventConfig eventConfig) {
if(eventConfig instanceof HalMqttDeviceConfig) {
HalMqttDeviceConfig mqttEvent = (HalMqttDeviceConfig) eventConfig;
public void register(HalDeviceConfig deviceConfig) {
if(deviceConfig instanceof HalMqttDeviceConfig) {
HalMqttDeviceConfig mqttEvent = (HalMqttDeviceConfig) deviceConfig;
topics.put(mqttEvent.getTopic(), mqttEvent);
} else throw new IllegalArgumentException(
"Device config is not an instance of " + HalMqttDeviceConfig.class + ": " + eventConfig.getClass());
"Device config is not an instance of " + HalMqttDeviceConfig.class + ": " + deviceConfig.getClass());
}
@Override
public void deregister(HalEventConfig eventConfig) {
if(eventConfig instanceof HalMqttDeviceConfig) {
HalMqttDeviceConfig mqttEvent = (HalMqttDeviceConfig) eventConfig;
public void deregister(HalDeviceConfig deviceConfig) {
if(deviceConfig instanceof HalMqttDeviceConfig) {
HalMqttDeviceConfig mqttEvent = (HalMqttDeviceConfig) deviceConfig;
topics.remove(mqttEvent.getTopic());
}
}
@ -147,7 +147,7 @@ public class HalMqttController implements HalAutoScannableController, MqttSubscr
}
@Override
public void setListener(HalEventReportListener listener) {
public void setListener(HalDeviceReportListener listener) {
eventListener = listener;
}
}

4
plugins/hal-mqtt/src/se/hal/plugin/mqtt/device/HalMqttDeviceConfig.java
View file

@ -71,12 +71,12 @@ public class HalMqttDeviceConfig implements HalEventConfig {
// --------------------------
@Override
public Class<? extends HalEventController> getEventControllerClass() {
public Class<? extends HalEventController> getDeviceControllerClass() {
return HalMqttController.class;
}
@Override
public Class<? extends HalEventData> getEventDataClass() {
public Class<? extends HalEventData> getDeviceDataClass() {
return HalMqttDeviceData.class;
}
}