Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions ...odel.rule.runtime/src/org/openhab/core/model/rule/runtime/internal/RuleContextHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.eclipse.emf.ecore.util.EContentAdapter;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.xtext.naming.QualifiedName;
import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
import org.eclipse.xtext.xbase.interpreter.IEvaluationContext;
import org.openhab.core.model.rule.RulesStandaloneSetup;
import org.openhab.core.model.rule.rules.RuleModel;
Expand Down Expand Up @@ -61,7 +60,7 @@ public static synchronized IEvaluationContext getContext(RuleModel ruleModel) {
for (VariableDeclaration var : ruleModel.getVariables()) {
try {
Object initialValue = var.getRight() == null ? null
: scriptEngine.newScriptFromXExpression(var.getRight()).execute();
: scriptEngine.newScriptFromXExpression(var.getRight()).execute(evaluationContext);
evaluationContext.newValue(QualifiedName.create(var.getName()), initialValue);
} catch (ScriptExecutionException e) {
logger.warn("Variable '{}' on rule file '{}' cannot be initialized with value '{}': {}", var.getName(),
Expand All @@ -72,14 +71,6 @@ public static synchronized IEvaluationContext getContext(RuleModel ruleModel) {
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
*/
Expand Down