]> git.basschouten.com Git - openhab-addons.git/commitdiff
[hueemulation] Provide non-null context to TriggerHandlerCallback (#12320)
authorWouter Born <github@maindrain.net>
Sat, 19 Feb 2022 20:37:51 +0000 (21:37 +0100)
committerGitHub <noreply@github.com>
Sat, 19 Feb 2022 20:37:51 +0000 (21:37 +0100)
This prevents NPEs and a compilation issue when openhab/openhab-core#2763 is merged.

Signed-off-by: Wouter Born <github@maindrain.net>
bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/AbsoluteDateTimeTriggerHandler.java
bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/automation/TimerTriggerHandler.java

index 8d6e1d22e711ff202d5ed2e00815a2a570fbbec1..6d27286fb1d07edcba77d56cb017867d96b9f668 100644 (file)
@@ -19,6 +19,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
+import java.util.Map;
 
 import org.openhab.core.automation.ModuleHandlerCallback;
 import org.openhab.core.automation.Trigger;
@@ -106,7 +107,7 @@ public class AbsoluteDateTimeTriggerHandler extends BaseTriggerModuleHandler imp
 
     @Override
     public void run() {
-        ((TriggerHandlerCallback) callback).triggered(module, null);
+        ((TriggerHandlerCallback) callback).triggered(module, Map.of());
         schedule = null;
     }
 }
index dd7e8f129f8c5b67b6f3e9a65566df60730bc737..3585c15d6f89fc007ddcdad779384755ba04996f 100644 (file)
@@ -13,6 +13,7 @@
 package org.openhab.io.hueemulation.internal.automation;
 
 import java.time.Duration;
+import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.Callable;
 
@@ -32,7 +33,7 @@ import org.slf4j.LoggerFactory;
  * As soon as that time has run up, it will trigger.
  * <p>
  * A random factor and repeat times can also be configured.
- * 
+ *
  * @author David Graeff - Initial contribution
  */
 @NonNullByDefault
@@ -114,7 +115,7 @@ public class TimerTriggerHandler extends BaseTriggerModuleHandler implements Cal
 
     @Override
     public Duration call() {
-        ((TriggerHandlerCallback) callback).triggered(module, null);
+        ((TriggerHandlerCallback) callback).triggered(module, Map.of());
         config.repeat -= 1;
         if (config.repeat == 0) {
             schedule = null;