Add event source for StartLevel event

This pull request adds an event source to the StartLevel event. With this rules can distinguish between events from the StartLevelService and events from the RuleEngine after a rule was changed.

Signed-off-by: TheNetStriker <david@masshardt.ch>

Author: TheNetStriker

bundles/org.openhab.core.automation/src/main/java/org/openhab/core/automation/internal/RuleEngineImpl.java

@@ -878,8 +878,10 @@ 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,
-                    "event", SystemEventFactory.createStartlevelEvent(StartLevelService.STARTLEVEL_RULES)));
+            runNow(rule.getUID(), true,
+                    Map.of(SystemTriggerHandler.OUT_STARTLEVEL, StartLevelService.STARTLEVEL_RULES, "event",
+                            SystemEventFactory.createStartlevelEvent(StartLevelService.STARTLEVEL_RULES,
+                                    RuleEngineImpl.class.getName())));
         }
 
         return true;
@@ -1599,7 +1601,8 @@ private void executeRulesWithStartLevel() {
                     .filter(this::mustTrigger) //
                     .forEach(r -> runNow(r.getUID(), true,
                             Map.of(SystemTriggerHandler.OUT_STARTLEVEL, StartLevelService.STARTLEVEL_RULES, "event",
-                                    SystemEventFactory.createStartlevelEvent(StartLevelService.STARTLEVEL_RULES))));
+                                    SystemEventFactory.createStartlevelEvent(StartLevelService.STARTLEVEL_RULES,
+                                            RuleEngineImpl.class.getName()))));
             started = true;
             readyService.markReady(MARKER);
             logger.info("Rule engine started.");

bundles/org.openhab.core.automation/src/test/java/org/openhab/core/automation/internal/module/handler/SystemTriggerHandlerTest.java

@@ -80,7 +80,7 @@ public void testDoesNotTriggerIfStartLevelEventLower() {
         SystemTriggerHandler triggerHandler = new SystemTriggerHandler(triggerMock, bundleContextMock);
         triggerHandler.setCallback(callbackMock);
 
-        Event event = SystemEventFactory.createStartlevelEvent(70);
+        Event event = SystemEventFactory.createStartlevelEvent(70, null);
         triggerHandler.receive(event);
 
         verifyNoInteractions(callbackMock);
@@ -93,7 +93,7 @@ public void testDoesTriggerIfStartLevelEventHigher() {
         SystemTriggerHandler triggerHandler = new SystemTriggerHandler(triggerMock, bundleContextMock);
         triggerHandler.setCallback(callbackMock);
 
-        Event event = SystemEventFactory.createStartlevelEvent(100);
+        Event event = SystemEventFactory.createStartlevelEvent(100, null);
         triggerHandler.receive(event);
 
         verify(callbackMock).triggered(eq(triggerMock), captor.capture());
@@ -109,7 +109,7 @@ public void testDoesNotTriggerAfterEventTrigger() {
         SystemTriggerHandler triggerHandler = new SystemTriggerHandler(triggerMock, bundleContextMock);
         triggerHandler.setCallback(callbackMock);
 
-        Event event = SystemEventFactory.createStartlevelEvent(100);
+        Event event = SystemEventFactory.createStartlevelEvent(100, null);
         triggerHandler.receive(event);
 
         verify(callbackMock).triggered(eq(triggerMock), captor.capture());

bundles/org.openhab.core/src/main/java/org/openhab/core/events/system/SystemEventFactory.java

@@ -42,10 +42,10 @@ public SystemEventFactory() {
      * @param startlevel Startlevel of system
      * @return Created start level event.
      */
-    public static StartlevelEvent createStartlevelEvent(Integer startlevel) {
+    public static StartlevelEvent createStartlevelEvent(Integer startlevel, @Nullable String source) {
         SystemEventPayloadBean bean = new SystemEventPayloadBean(startlevel);
         String payload = serializePayload(bean);
-        return new StartlevelEvent(SYSTEM_STARTLEVEL_TOPIC, payload, null, startlevel);
+        return new StartlevelEvent(SYSTEM_STARTLEVEL_TOPIC, payload, source, startlevel);
     }
 
     @Override

bundles/org.openhab.core/src/main/java/org/openhab/core/service/StartLevelService.java

@@ -255,7 +255,8 @@ private void setStartLevel(int level) {
         }
         openHABStartLevel = level;
         scheduler.submit(() -> {
-            StartlevelEvent startlevelEvent = SystemEventFactory.createStartlevelEvent(level);
+            StartlevelEvent startlevelEvent = SystemEventFactory.createStartlevelEvent(level,
+                    StartLevelService.class.getName());
             eventPublisher.post(startlevelEvent);
             logger.debug("Reached start level {}", level);
         });