demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Textual Rules: evaluate global variables in the context of previous variables (#5086)

Browse Source
This commit is contained in:
Дилян Палаузов
2026-02-28 18:35:04 +01:00
committed by GitHub
parent 0a1cc016bc
commit 71c5bcdcb3
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.model.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleContextHelper.java
+1 -10
View File
@@ -16,7 +16,6 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.ecore.util.EContentAdapter; import org.eclipse.emf.ecore.util.EContentAdapter;
import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.naming.QualifiedName;
import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
import org.eclipse.xtext.xbase.interpreter.IEvaluationContext; import org.eclipse.xtext.xbase.interpreter.IEvaluationContext;
import org.openhab.core.model.rule.RulesStandaloneSetup; import org.openhab.core.model.rule.RulesStandaloneSetup;
import org.openhab.core.model.rule.rules.RuleModel; import org.openhab.core.model.rule.rules.RuleModel;
@@ -61,7 +60,7 @@ public class RuleContextHelper {
for (VariableDeclaration var : ruleModel.getVariables()) { for (VariableDeclaration var : ruleModel.getVariables()) {
try { try {
Object initialValue = var.getRight() == null ? null Object initialValue = var.getRight() == null ? null
: scriptEngine.newScriptFromXExpression(var.getRight()).execute(); : scriptEngine.newScriptFromXExpression(var.getRight()).execute(evaluationContext);
evaluationContext.newValue(QualifiedName.create(var.getName()), initialValue); evaluationContext.newValue(QualifiedName.create(var.getName()), initialValue);
} catch (ScriptExecutionException e) { } catch (ScriptExecutionException e) {
logger.warn("Variable '{}' on rule file '{}' cannot be initialized with value '{}': {}", var.getName(), logger.warn("Variable '{}' on rule file '{}' cannot be initialized with value '{}': {}", var.getName(),
@@ -72,14 +71,6 @@ public class RuleContextHelper {
return evaluationContext; return evaluationContext;
} }
public static synchronized String getVariableDeclaration(RuleModel ruleModel) {
StringBuilder vars = new StringBuilder();
for (VariableDeclaration var : ruleModel.getVariables()) {
vars.append(NodeModelUtils.findActualNodeFor(var).getText());
}
return vars.toString();
}
/** /**
* Inner class that wraps an evaluation context into an EMF adapters * Inner class that wraps an evaluation context into an EMF adapters
*/ */