demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[mqtt.homeassistant] avoid improperly delivered triggers (#17584)

Browse Source 
if multiple DeviceTrigger components share a topic, and each
has a payload value configured, only messages matching that
payload should be delivered to the corresponding channel

Signed-off-by: Cody Cutrer <cody@cutrer.us>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
Cody Cutrer 2024-10-18 07:24:50 -06:00 committed by Ciprian Pascu
parent 6f283a47d4
commit 69c519e06d
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.binding.mqtt.generic/src/main/java/org/openhab/binding/mqtt/generic/ChannelState.java
View File

@ -173,6 +173,13 @@ public class ChannelState implements MqttMessageSubscriber {
// Is trigger?: Special handling
if (config.trigger) {
try {
cachedValue.parseMessage(new StringType(strValue));
} catch (IllegalArgumentException e) {
// invalid value for this trigger; ignore
receivedOrTimeout();
return;
}
channelStateUpdateListener.triggerChannel(channelUID, strValue);
receivedOrTimeout();
return;

9
bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/AbstractComponentTests.java
View File

@ -237,6 +237,15 @@ public abstract class AbstractComponentTests extends AbstractHomeAssistantTests
verify(thingHandler).triggerChannel(eq(component.getChannel(channelId).getChannel().getUID()), eq(trigger));
}
/**
* Assert a channel does not triggers=
*/
protected void assertNotTriggered(AbstractComponent<@NonNull ? extends AbstractChannelConfiguration> component,
String channelId, String trigger) {
verify(thingHandler, never()).triggerChannel(eq(component.getChannel(channelId).getChannel().getUID()),
eq(trigger));
}
/**
* Assert that given payload was published exact-once on given topic.
*

3
bundles/org.openhab.binding.mqtt.homeassistant/src/test/java/org/openhab/binding/mqtt/homeassistant/internal/component/DeviceTriggerTests.java
View File

@ -62,6 +62,9 @@ public class DeviceTriggerTests extends AbstractComponentTests {
spyOnChannelUpdates(component, "action");
publishMessage("zigbee2mqtt/Charge Now Button/action", "on");
assertTriggered(component, "action", "on");
publishMessage("zigbee2mqtt/Charge Now Button/action", "off");
assertNotTriggered(component, "action", "off");
}
@Override