100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Disable SandboxTransformer (that's not doing anything anyway) for Groovy rules (#2849)
Eric Bariauxc15bc93863e4
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.javaindex fabd04137..df306aec6 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java@@ -90,7 +90,8 @@ public class RulesetDeployment {then check your class loader setup.*/groovyShell = new GroovyShell(- new CompilerConfiguration().addCompilationCustomizers(new SandboxTransformer())+ // See https://github.com/openremote/openremote/issues/2843, can't use SandboxTransformer until it's Groovy 5 compatible+ // new CompilerConfiguration().addCompilationCustomizers(new SandboxTransformer()));}diff --git a/test/src/test/groovy/org/openremote/test/rules/GroovyRulesRuntimeTest.groovy b/test/src/test/groovy/org/openremote/test/rules/GroovyRulesRuntimeTest.groovynew file mode 100644index 000000000..f8dc24830--- /dev/null+++ b/test/src/test/groovy/org/openremote/test/rules/GroovyRulesRuntimeTest.groovy@@ -0,0 +1,69 @@+package org.openremote.test.rules++import org.openremote.manager.rules.RulesEngine+import org.openremote.manager.rules.RulesService+import org.openremote.manager.rules.RulesetStorageService+import org.openremote.model.Constants+import org.openremote.model.rules.RealmRuleset+import org.openremote.test.ManagerContainerTrait+import spock.lang.Specification+import spock.util.concurrent.PollingConditions++import static org.openremote.manager.rules.RulesService.OR_RULES_QUICK_FIRE_MILLIS+import static org.openremote.model.rules.Ruleset.Lang.GROOVY+import static org.openremote.model.rules.RulesetStatus.DEPLOYED++class GroovyRulesRuntimeTest extends Specification implements ManagerContainerTrait {++ private static final String MODULO_RULE = '''+ package demo.rules++ rules.add()+ .name("Modulo operator")+ .when({+ facts ->+ !facts.matchFirst("Modulo operator").isPresent() &&+ (10 % 4) == 2+ })+ .then({+ facts ->+ facts.put("Modulo operator", "fired")+ })+ '''.stripIndent()++ @SuppressWarnings("GroovyAccessibility")+ def "Groovy modulo operator evaluates during rule execution"() {+ given: "the container is started"+ def conditions = new PollingConditions(timeout: 10, delay: 0.2)+ def config = defaultConfig()+ config[OR_RULES_QUICK_FIRE_MILLIS] = "60000"+ def container = startContainer(config, defaultServices())+ def rulesService = container.getService(RulesService.class)+ def rulesetStorageService = container.getService(RulesetStorageService.class)+ RulesEngine engine = null++ and: "a Groovy ruleset uses the modulo operator in a condition"+ def ruleset = rulesetStorageService.merge(new RealmRuleset(+ Constants.MASTER_REALM,+ "Modulo operator runtime failure",+ GROOVY,+ MODULO_RULE))++ expect: "the ruleset is compiled and deployed before it is evaluated"+ conditions.eventually {+ engine = rulesService.realmEngines.get(Constants.MASTER_REALM)+ assert engine != null+ assert engine.isRunning()+ assert engine.deployments[ruleset.id].status == DEPLOYED+ }++ when: "the ruleset is evaluated"+ engine.fireAllDeployments()++ then: "the rule fires without recording a runtime error"+ def deployment = engine.deployments[ruleset.id]+ deployment.getError() == null+ engine.facts.get("Modulo operator") == "fired"+ engine.isRunning()+ }+}