Skip to content

AbstractScriptModuleHandler: Remove prefixes from ctx keys when setting execution context #4919

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

Merged
holgerfriedrich merged 1 commit into from
Aug 16, 2025
Merged

AbstractScriptModuleHandler: Remove prefixes from ctx keys when setting execution context #4919

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
19 changes: 11 additions & 8 deletions ...g/openhab/core/automation/module/script/internal/handler/AbstractScriptModuleHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,21 +163,24 @@ protected void setExecutionContext(ScriptEngine engine, Map<String, ?> context)

// Add the rule's UID to the context and make it available as "ctx".
// Note: We don't use "context" here as it doesn't work on all JVM versions!
final Map<String, Object> contextNew = new HashMap<>(context);
contextNew.put("ruleUID", this.ruleUID);
executionContext.setAttribute("ctx", contextNew, ScriptContext.ENGINE_SCOPE);

// Add the rule's UID to the global namespace.
executionContext.setAttribute("ruleUID", this.ruleUID, ScriptContext.ENGINE_SCOPE);

// add the single context entries without their prefix to the scope
final Map<String, Object> contextNew = new HashMap<>();
// add the single context entries without their prefix to contextNew
for (Entry<String, ?> entry : context.entrySet()) {
Object value = entry.getValue();
String key = entry.getKey();
int dotIndex = key.indexOf('.');
if (dotIndex != -1) {
key = key.substring(dotIndex + 1);
}
contextNew.put(key, value);
}
contextNew.put("ruleUID", this.ruleUID);
executionContext.setAttribute("ctx", contextNew, ScriptContext.ENGINE_SCOPE);

// add the single contextNew entries to the scope
for (Entry<String, ?> entry : contextNew.entrySet()) {
Object value = entry.getValue();
String key = entry.getKey();
executionContext.setAttribute(key, value, ScriptContext.ENGINE_SCOPE);
}
}
Expand Down