Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Add support for %RULESET_ID% and %RULESET_NAME% variables in JSON Rules

Rich Turner764d8b018a1f
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
index 38f395122..58c6beb7e 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
@@ -201,7 +201,10 @@ public class RulesetDeployment {
protected boolean startRulesJson(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade notificationFacade) {
try {
- JsonRulesetDefinition jsonRulesetDefinition = Container.JSON.readValue(ruleset.getRules(), JsonRulesetDefinition.class);
+ String rulesStr = ruleset.getRules();
+ rulesStr = rulesStr.replace("%RULESET_ID%", Long.toString(ruleset.getId()));
+ rulesStr = rulesStr.replace("%RULESET_NAME%", ruleset.getName());
+ JsonRulesetDefinition jsonRulesetDefinition = Container.JSON.readValue(rulesStr, JsonRulesetDefinition.class);
JsonRulesBuilder jsonRulesBuilder = new JsonRulesBuilder(timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationFacade, this::scheduleRuleAction);
Arrays.stream(jsonRulesetDefinition.rules).forEach(jsonRulesBuilder::add);