Include StartLevelEvent in start level triggers (openhab#4093)

Signed-off-by: Jimmy Tanagra <[email protected]>
andrewfg · Feb 18, 2024 · b64e972 · b64e972
1 parent e628f75
commit b64e972
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...ab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEngineImpl.java b/...ab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEngineImpl.java
@@ -76,6 +76,7 @@
 import org.openhab.core.common.registry.RegistryChangeListener;
 import org.openhab.core.events.Event;
 import org.openhab.core.events.EventPublisher;
+import org.openhab.core.events.system.SystemEventFactory;
 import org.openhab.core.service.ReadyMarker;
 import org.openhab.core.service.ReadyMarkerFilter;
 import org.openhab.core.service.ReadyService;
@@ -854,8 +855,8 @@ private boolean activateRule(final WrappedRule rule) {
         if (slTriggers.stream()
                 .anyMatch(t -> ((BigDecimal) t.getConfiguration().get(SystemTriggerHandler.CFG_STARTLEVEL))
                         .intValue() <= startLevelService.getStartLevel())) {
-            runNow(rule.getUID(), true,
-                    Map.of(SystemTriggerHandler.OUT_STARTLEVEL, StartLevelService.STARTLEVEL_RULES));
+            runNow(rule.getUID(), true, Map.of(SystemTriggerHandler.OUT_STARTLEVEL, StartLevelService.STARTLEVEL_RULES,
+                    "event", SystemEventFactory.createStartlevelEvent(StartLevelService.STARTLEVEL_RULES)));
         }
 
         return true;
@@ -1447,7 +1448,8 @@ private void executeRulesWithStartLevel() {
             ruleRegistry.getAll().stream() //
                     .filter(this::mustTrigger) //
                     .forEach(r -> runNow(r.getUID(), true,
-                            Map.of(SystemTriggerHandler.OUT_STARTLEVEL, StartLevelService.STARTLEVEL_RULES)));
+                            Map.of(SystemTriggerHandler.OUT_STARTLEVEL, StartLevelService.STARTLEVEL_RULES, "event",
+                                    SystemEventFactory.createStartlevelEvent(StartLevelService.STARTLEVEL_RULES))));
             started = true;
             readyService.markReady(MARKER);
             logger.info("Rule engine started.");

diff --git a/...c/main/java/org/openhab/core/automation/internal/module/handler/SystemTriggerHandler.java b/...c/main/java/org/openhab/core/automation/internal/module/handler/SystemTriggerHandler.java
@@ -13,7 +13,6 @@
 package org.openhab.core.automation.internal.module.handler;
 
 import java.math.BigDecimal;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -87,7 +86,7 @@ public void receive(Event event) {
             if (startlevel <= sl && startlevel > StartLevelService.STARTLEVEL_RULEENGINE) {
                 // only execute rules if their start level is higher than the rule engine activation level, since
                 // otherwise the rule engine takes care of the execution already
-                trigger();
+                trigger(event);
             }
         }
     }
@@ -101,15 +100,14 @@ public void dispose() {
         super.dispose();
     }
 
-    public void trigger() {
+    private void trigger(Event event) {
         final ModuleHandlerCallback callback = this.callback;
         if (!(callback instanceof TriggerHandlerCallback)) {
             return;
         }
 
         TriggerHandlerCallback thCallback = (TriggerHandlerCallback) callback;
-        Map<String, Object> values = new HashMap<>();
-        values.put(OUT_STARTLEVEL, startlevel);
+        Map<String, Object> values = Map.of(OUT_STARTLEVEL, startlevel, "event", event);
         thCallback.triggered(module, values);
         triggered = true;
     }