Add triggeringThing name to DSL rules (openhab#2756)

* Add triggeringThing name to DSL rules * Include previous and new statuses Signed-off-by: James Melville <[email protected]> GitOrigin-RevId: 805f223
ConnectorIO · Jul 12, 2023 · efd00ca · efd00ca
1 parent 8550c06
commit efd00ca
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/...pt.runtime/src/org/openhab/core/model/script/runtime/internal/engine/DSLScriptEngine.java b/...pt.runtime/src/org/openhab/core/model/script/runtime/internal/engine/DSLScriptEngine.java
@@ -38,6 +38,7 @@
 import org.openhab.core.model.script.jvmmodel.ScriptJvmModelInferrer;
 import org.openhab.core.model.script.runtime.DSLScriptContextProvider;
 import org.openhab.core.thing.events.ChannelTriggeredEvent;
+import org.openhab.core.thing.events.ThingStatusInfoChangedEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -173,6 +174,15 @@ private DefaultEvaluationContext createEvaluationContext(Script script, IEvaluat
             evalContext.newValue(QualifiedName.create(ScriptJvmModelInferrer.VAR_TRIGGERING_ITEM_NAME),
                     event.getItemName());
         }
+        if (value instanceof ThingStatusInfoChangedEvent) {
+            ThingStatusInfoChangedEvent event = (ThingStatusInfoChangedEvent) value;
+            evalContext.newValue(QualifiedName.create(ScriptJvmModelInferrer.VAR_TRIGGERING_THING),
+                    event.getThingUID().toString());
+            evalContext.newValue(QualifiedName.create(ScriptJvmModelInferrer.VAR_PREVIOUS_STATUS),
+                    event.getOldStatusInfo().getStatus().toString());
+            evalContext.newValue(QualifiedName.create(ScriptJvmModelInferrer.VAR_NEW_STATUS),
+                    event.getStatusInfo().getStatus().toString());
+        }
 
         return evalContext;
     }