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
Added option for continue on error for Rules
Michael Rademakera6e48b12da66
diff --git a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.java b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.javaindex 0a407ef0e..8ad49ab43 100644--- a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.java+++ b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.java@@ -84,7 +84,7 @@ public class AssetRulesEditorActivity@Overrideprotected AssetRuleset newRuleset() {- return new AssetRuleset(null, null, null, assetId, false);+ return new AssetRuleset(null, null, null, assetId, false, false);}@Overridediff --git a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.java b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.javaindex 3507592d0..1db71dbfb 100644--- a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.java+++ b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.java@@ -84,7 +84,7 @@ public class TenantRulesEditorActivity@Overrideprotected TenantRuleset newRuleset() {- return new TenantRuleset(null, null, null, realm, false);+ return new TenantRuleset(null, null, null, realm, false, false);}@Overridediff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.javaindex 7e4bd0cb4..349ca1844 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java@@ -32,8 +32,8 @@ import org.openremote.manager.rules.facade.NotificationsFacade;import org.openremote.manager.rules.facade.UsersFacade;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.model.asset.Asset;-import org.openremote.model.attribute.MetaItemType;import org.openremote.model.attribute.AttributeType;+import org.openremote.model.attribute.MetaItemType;import org.openremote.model.query.filter.GeofencePredicate;import org.openremote.model.query.filter.LocationAttributePredicate;import org.openremote.model.rules.*;@@ -434,10 +434,12 @@ public class RulesEngine<T extends Ruleset> {// TODO We always stop on any error, good idea?// TODO We only get here on LHS runtime errors, RHS runtime errors are in RuleFacts.onFailure()- stop();- // TODO We skip any other deployment when we hit the first error, good idea?- break;+ if (!deployment.ruleset.isContinueOnError()) {+ stop();+ // TODO We skip any other deployment when we hit the first error, good idea?+ break;+ }} finally {// Reset facts after this firing (loop detection etc.)facts.reset();diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.javaindex b4379d555..6362d6786 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java@@ -73,7 +73,7 @@ public class RulesetStorageService implements ContainerService {public List<GlobalRuleset> findGlobalRulesets(boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {String query = "select new org.openremote.model.rules.GlobalRuleset(" +- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.enabled, rs.name, rs.lang, rs.meta";+ "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.enabled, rs.name, rs.lang, rs.meta, rs.continueOnError";query += fullyPopulate ? ", rs.rules" : ", cast(null as string)";@@ -115,7 +115,7 @@ public class RulesetStorageService implements ContainerService {query += fullyPopulate ? ", rs.rules" : ", cast(null as string)";- query += ", rs.realm, rs.accessPublicRead) " ++ query += ", rs.realm, rs.accessPublicRead, rs.continueOnError) " +"from TenantRuleset rs " +"where 1=1 ";@@ -170,7 +170,7 @@ public class RulesetStorageService implements ContainerService {query += fullyPopulate ? ", rs.rules" : ", cast(null as string)";- query += ", a.realm, rs.assetId, rs.accessPublicRead) " ++ query += ", a.realm, rs.assetId, rs.accessPublicRead, rs.continueOnError) " +"from AssetRuleset rs, Asset a " +"where rs.assetId = a.id ";diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.javaindex d0d460f02..02433542d 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java@@ -26,7 +26,6 @@ import org.openremote.manager.security.UserConfiguration;import org.openremote.manager.setup.AbstractManagerSetup;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetAttribute;-import org.openremote.model.attribute.MetaItemType;import org.openremote.model.asset.UserAsset;import org.openremote.model.attribute.*;import org.openremote.model.geo.GeoJSONPoint;@@ -44,10 +43,10 @@ import java.time.ZonedDateTime;import java.util.Arrays;import java.util.List;-import static org.openremote.model.attribute.MetaItemType.*;import static org.openremote.model.asset.AssetType.*;import static org.openremote.model.asset.agent.ProtocolConfiguration.initProtocolConfiguration;import static org.openremote.model.attribute.AttributeValueType.*;+import static org.openremote.model.attribute.MetaItemType.*;import static org.openremote.model.rules.Ruleset.Lang.GROOVY;public class ManagerDemoSetup extends AbstractManagerSetup {@@ -875,6 +874,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {AssetRuleset camera3Rules = new AssetRuleset("Camera3_Rules",GROOVY, IOUtils.toString(getClass().getResource("/demo/rules/DemoSmartCityCamera.groovy"), "UTF-8"), camera3Asset.getId(),+ false,false);camera3Rules = rulesetStorageService.merge(camera3Rules);diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.javaindex b9b1a6c52..581801d82 100644--- a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java@@ -55,35 +55,35 @@ public class RulesDemoSetup extends AbstractManagerSetup {try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidencePresenceDetection.groovy")) {String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));Ruleset ruleset = new AssetRuleset(- "Demo Residence - Presence Detection with motion and CO2 sensors", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false+ "Demo Residence - Presence Detection with motion and CO2 sensors", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false);apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();}try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceVacationMode.groovy")) {String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));Ruleset ruleset = new AssetRuleset(- "Demo Residence - Vacation Mode", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false+ "Demo Residence - Vacation Mode", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false);apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();}try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceAutoVentilation.groovy")) {String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));Ruleset ruleset = new AssetRuleset(- "Demo Residence - Auto Ventilation", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false+ "Demo Residence - Auto Ventilation", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false);apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();}try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy")) {String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));Ruleset ruleset = new AssetRuleset(- "Demo Residence - Notify Alarm Trigger", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false+ "Demo Residence - Notify Alarm Trigger", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false);apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();}try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceSmartSwitch.groovy")) {String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));Ruleset ruleset = new AssetRuleset(- "Demo Residence - Smart Start Switch", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false+ "Demo Residence - Smart Start Switch", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false);apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();}@@ -92,7 +92,7 @@ public class RulesDemoSetup extends AbstractManagerSetup {try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceAllLightsOff.js")) {String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));Ruleset ruleset = new AssetRuleset(- "Demo Residence - All Lights Off", Ruleset.Lang.JAVASCRIPT, rules, managerDemoSetup.apartment2Id, false+ "Demo Residence - All Lights Off", Ruleset.Lang.JAVASCRIPT, rules, managerDemoSetup.apartment2Id, false, false);apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();}@@ -100,7 +100,7 @@ public class RulesDemoSetup extends AbstractManagerSetup {try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoConsoleLocation.groovy")) {String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));Ruleset ruleset = new TenantRuleset(- "Demo Console Location", Ruleset.Lang.GROOVY, rules, keycloakDemoSetup.tenantA.getRealm(), true+ "Demo Console Location", Ruleset.Lang.GROOVY, rules, keycloakDemoSetup.tenantA.getRealm(), true, false);tenantARulesetId = rulesetStorageService.merge(ruleset).getId();}diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20190806_06__AddRulesetContinueOnError.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20190806_06__AddRulesetContinueOnError.sqlnew file mode 100644index 000000000..9c6d354ea--- /dev/null+++ b/manager/src/main/resources/org/openremote/manager/setup/database/V20190806_06__AddRulesetContinueOnError.sql@@ -0,0 +1,15 @@+/*+ Adds continueOnError column to rulesets+ */++-- UPDATE GLOBAL_RULESET+ALTER TABLE GLOBAL_RULESET+ ADD COLUMN CONTINUE_ON_ERROR BOOLEAN NOT NULL DEFAULT false;++-- UPDATE ASSET_RULESET+ALTER TABLE ASSET_RULESET+ ADD COLUMN CONTINUE_ON_ERROR BOOLEAN NOT NULL DEFAULT false;++-- UPDATE TENANT_RULESET+ALTER TABLE TENANT_RULESET+ ADD COLUMN CONTINUE_ON_ERROR BOOLEAN NOT NULL DEFAULT false;\ No newline at end of filediff --git a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java b/model/src/main/java/org/openremote/model/rules/AssetRuleset.javaindex 74fadfa56..0ec81a230 100644--- a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java@@ -21,7 +21,10 @@ package org.openremote.model.rules;import org.openremote.model.value.ObjectValue;-import javax.persistence.*;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Table;+import javax.persistence.Transient;import java.util.Date;/**@@ -46,20 +49,20 @@ public class AssetRuleset extends Ruleset {public AssetRuleset() {}- public AssetRuleset(String name, Lang lang, String rules, String assetId, boolean accessPublicRead) {- super(name, rules, lang);+ public AssetRuleset(String name, Lang lang, String rules, String assetId, boolean accessPublicRead, boolean continueOnError) {+ super(name, rules, lang, continueOnError);this.assetId = assetId;this.accessPublicRead = accessPublicRead;}- public AssetRuleset(String name, Lang lang, ObjectValue meta, String rules, String assetId, boolean accessPublicRead) {- super(name, rules, lang, meta);+ public AssetRuleset(String name, Lang lang, ObjectValue meta, String rules, String assetId, boolean accessPublicRead, boolean continueOnError) {+ super(name, rules, lang, meta, continueOnError);this.assetId = assetId;this.accessPublicRead = accessPublicRead;}- public AssetRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, String rules, String realm, String assetId, boolean accessPublicRead) {- super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta);+ public AssetRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, String rules, String realm, String assetId, boolean accessPublicRead, boolean continueOnError) {+ super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta, continueOnError);this.assetId = assetId;this.realm = realm;this.accessPublicRead = accessPublicRead;diff --git a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.javaindex 1c916df3b..863b6bda0 100644--- a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java@@ -37,16 +37,16 @@ public class GlobalRuleset extends Ruleset {public GlobalRuleset() {}- public GlobalRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, String rules) {- super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta);+ public GlobalRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, boolean continueOnError, String rules) {+ super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta, continueOnError);}public GlobalRuleset(String name, Lang lang, String rules) {- super(name, rules, lang);+ super(name, rules, lang, false);}public GlobalRuleset(String name, Lang lang, String rules, ObjectValue meta) {- super(name, rules, lang, meta);+ super(name, rules, lang, meta, false);}@Overridediff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.javaindex 39912f379..6ab68e1dd 100644--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java@@ -189,6 +189,9 @@ public abstract class Ruleset {@org.hibernate.annotations.Type(type = PERSISTENCE_JSON_OBJECT_TYPE)protected ObjectValue meta;+ @Column(name = "CONTINUE_ON_ERROR", nullable = false)+ protected boolean continueOnError = false;+@Transientprotected RulesetStatus status;@@ -199,10 +202,10 @@ public abstract class Ruleset {}public Ruleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, Lang lang) {- this(id, version, createdOn, lastModified, name, enabled, null, lang, null);+ this(id, version, createdOn, lastModified, name, enabled, null, lang, null, false);}- public Ruleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String rules, Lang lang, ObjectValue meta) {+ public Ruleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String rules, Lang lang, ObjectValue meta, boolean continueOnError) {this.id = id;this.version = version;this.createdOn = createdOn;@@ -212,17 +215,19 @@ public abstract class Ruleset {this.rules = rules;this.lang = lang;this.meta = meta;+ this.continueOnError = continueOnError;}- public Ruleset(String name, String rules, Lang lang, ObjectValue meta) {- this(name, rules, lang);+ public Ruleset(String name, String rules, Lang lang, ObjectValue meta, boolean continueOnError) {+ this(name, rules, lang, continueOnError);this.meta = meta;}- public Ruleset(String name, String rules, Lang lang) {+ public Ruleset(String name, String rules, Lang lang, boolean continueOnError) {this.name = name;this.rules = rules;this.lang = lang;+ this.continueOnError = continueOnError;}public Long getId() {@@ -310,4 +315,12 @@ public abstract class Ruleset {public void setError(String error) {this.error = error;}++ public boolean isContinueOnError() {+ return continueOnError;+ }++ public void setContinueOnError(boolean continueOnError) {+ this.continueOnError = continueOnError;+ }}diff --git a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java b/model/src/main/java/org/openremote/model/rules/TenantRuleset.javaindex b6753bc4b..3ba3564eb 100644--- a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/TenantRuleset.java@@ -45,20 +45,20 @@ public class TenantRuleset extends Ruleset {public TenantRuleset() {}- public TenantRuleset(String name, Lang lang, String rules, String realm, boolean accessPublicRead) {- super(name, rules, lang);+ public TenantRuleset(String name, Lang lang, String rules, String realm, boolean accessPublicRead, boolean continueOnError) {+ super(name, rules, lang, continueOnError);this.realm = realm;this.accessPublicRead = accessPublicRead;}- public TenantRuleset(String name, Lang lang, ObjectValue meta, String rules, String realm, boolean accessPublicRead) {- super(name, rules, lang, meta);+ public TenantRuleset(String name, Lang lang, ObjectValue meta, String rules, String realm, boolean accessPublicRead, boolean continueOnError) {+ super(name, rules, lang, meta, continueOnError);this.realm = realm;this.accessPublicRead = accessPublicRead;}- public TenantRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, String rules, String realm, boolean accessPublicRead) {- super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta);+ public TenantRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, String rules, String realm, boolean accessPublicRead, boolean continueOnError) {+ super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta, continueOnError);this.realm = realm;this.accessPublicRead = accessPublicRead;}diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovyindex da6efb5f0..cf8ffef56 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy@@ -861,7 +861,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {def lobby = assetStorageService.find(managerDemoSetup.lobbyId, true)lobby.addAttributes(- new AssetAttribute("openingDate", DATETIME, Values.create("2018-01-28T15:00:00"))+ new AssetAttribute("openingDate", DATETIME, Values.create("2018-01-28T15:00:00+00:00")))lobby = assetStorageService.merge(lobby)diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovyindex 6a6637812..97a1d8aae 100644--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy@@ -98,8 +98,9 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {and: "the demo location predicate console rules are loaded"Ruleset ruleset = new TenantRuleset("Demo Tenant A - Console Location", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoConsoleLocation.groovy").text,- keycloakDemoSetup.tenantA.realm- , false+ keycloakDemoSetup.tenantA.realm,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -500,7 +501,9 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {when: "a new ruleset is deployed on the console parent asset with multiple location predicate rules (including a duplicate and a rectangular predicate)"def newRuleset = new AssetRuleset("Console test location predicates", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/BasicLocationPredicates.groovy").text,- testUser3Console1.parentId, false+ testUser3Console1.parentId,+ false,+ false)newRuleset = rulesetStorageService.merge(newRuleset)RulesEngine consoleParentEngine = nulldiff --git a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy b/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovyindex 8e50032f6..5ac3635ce 100644--- a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy+++ b/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy@@ -30,7 +30,9 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaineand: "some rules"Ruleset ruleset = new AssetRuleset("Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy").text,- managerDemoSetup.apartment2Id, false+ managerDemoSetup.apartment2Id,+ false,+ false)ruleset = rulesetStorageService.merge(ruleset)@@ -64,7 +66,9 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaineand: "some rules"Ruleset ruleset = new AssetRuleset("Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy").text,- managerDemoSetup.apartment2Id, false+ managerDemoSetup.apartment2Id,+ false,+ false)ruleset = rulesetStorageService.merge(ruleset)@@ -98,7 +102,9 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaineand: "some rules"Ruleset ruleset = new AssetRuleset("Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text,- managerDemoSetup.apartment2Id, false+ managerDemoSetup.apartment2Id,+ false,+ false)ruleset = rulesetStorageService.merge(ruleset)@@ -132,7 +138,9 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaineand: "some rules"Ruleset ruleset = new AssetRuleset("Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text,- managerDemoSetup.apartment2Id, false+ managerDemoSetup.apartment2Id,+ false,+ false)ruleset = rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovyindex ce95c634c..325c8d95a 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy@@ -9,6 +9,7 @@ import org.openremote.manager.setup.builtin.KeycloakDemoSetupimport org.openremote.manager.setup.builtin.ManagerDemoSetupimport org.openremote.model.rules.AssetRulesetimport org.openremote.model.rules.GlobalRuleset+import org.openremote.model.rules.RulesetStatusimport org.openremote.model.rules.TenantRulesetimport org.openremote.test.ManagerContainerTraitimport spock.lang.Specification@@ -73,8 +74,9 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerwhen: "a new tenant rule definition is added to Tenant A"ruleset = new TenantRuleset("Some more tenantA tenant rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text,- keycloakDemoSetup.tenantA.realm- , false+ keycloakDemoSetup.tenantA.realm,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -91,8 +93,9 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerwhen: "a new tenant rule definition is added to Tenant B"ruleset = new TenantRuleset("Some more tenantB tenant rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text,- keycloakDemoSetup.tenantB.realm- , false+ keycloakDemoSetup.tenantB.realm,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -228,6 +231,24 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainerassert apartment3Engine.deployments.values().any({ it.name == "Some apartment 3 demo rules" && it.status == DEPLOYED})}+ when: "a new tenant rule definition is added to Tenant A"+ ruleset = new TenantRuleset(+ "Looping error", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicLoopingErrorRules.groovy").text,+ keycloakDemoSetup.tenantA.realm,+ false,+ true+ )+ rulesetStorageService.merge(ruleset)++ then: "the tenants A rule engine should run with one deployment as error"+ conditions.eventually {+ tenantAEngine = rulesService.tenantEngines.get(keycloakDemoSetup.tenantA.realm)+ assert tenantAEngine != null+ assert tenantAEngine.isRunning()+ assert tenantAEngine.deployments.size() == 3+ assert tenantAEngine.deployments.values().any({it.status == EXECUTION_ERROR})+ }+//TODO: Reinstate the tenant delete test once tenant delete mechanism is finalised// when: "a tenant is deleted"// identityService.deleteTenant(accessToken, tenantATenant.getRealm())diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovyindex 6d8ecc3f5..6769dd26b 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy@@ -55,28 +55,34 @@ class BasicRulesImport {ruleset = new TenantRuleset("Some master tenant demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,keycloakDemoSetup.masterTenant.realm- , false+ ,+ false,+ false)masterRulesetId = rulesetStorageService.merge(ruleset).idruleset = new TenantRuleset("Some tenantA tenant demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- keycloakDemoSetup.tenantA.realm- , false+ keycloakDemoSetup.tenantA.realm,+ false,+ false)tenantARulesetId = rulesetStorageService.merge(ruleset).idruleset = new TenantRuleset("Some tenantB tenant demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- keycloakDemoSetup.tenantB.realm- , false+ keycloakDemoSetup.tenantB.realm,+ false,+ false)ruleset.setEnabled(false)tenantBRulesetId = rulesetStorageService.merge(ruleset).idruleset = new AssetRuleset("Some apartment 1 demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)ruleset.setEnabled(false)apartment1RulesetId = rulesetStorageService.merge(ruleset).id@@ -84,13 +90,17 @@ class BasicRulesImport {ruleset = new AssetRuleset("Some apartment 2 demo rules", GROOVY, Values.createObject().put("visible", true),getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- managerDemoSetup.apartment2Id, false+ managerDemoSetup.apartment2Id,+ false,+ false)apartment2RulesetId = rulesetStorageService.merge(ruleset).idruleset = new AssetRuleset("Some apartment 3 demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- managerDemoSetup.apartment3Id, false+ managerDemoSetup.apartment3Id,+ false,+ false)apartment3RulesetId = rulesetStorageService.merge(ruleset).id}diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovyindex 0c6bd5648..926492491 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy@@ -130,7 +130,9 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainerwhen: "a LHS filtering test rule definition is loaded into the Smart Building asset"def assetRuleset = new AssetRuleset("Some Smart Building asset rules", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy").text,- managerDemoSetup.smartBuildingId, false+ managerDemoSetup.smartBuildingId,+ false,+ false)rulesetStorageService.merge(assetRuleset)RulesEngine smartHomeEngine = null@@ -376,8 +378,9 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainerwhen: "a broken RHS rule is loaded into the tenantA engine"def ruleset = new TenantRuleset("Some broken test rules", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/BasicBrokenRules.groovy").text,- keycloakDemoSetup.tenantA.realm- , false+ keycloakDemoSetup.tenantA.realm,+ false,+ false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovyindex c74640d83..43cc5ecf5 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -137,7 +137,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 404when: "a tenant ruleset is created in the authenticated realm"- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false)+ def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)[1].idtenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)@@ -200,7 +200,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 404when: "a tenant ruleset is created in a non-authenticated realm"- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false)+ tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, null, false)[1].idtenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)@@ -216,7 +216,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainertenantRuleset.realm == keycloakDemoSetup.tenantA.realmwhen: "an asset ruleset is created in the authenticated realm"- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false)+ def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, null, false)[0].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -279,7 +279,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 404when: "an asset ruleset is created in a non-authenticated realm"- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment2Id, false)+ assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment2Id, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, null, false)[1].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -383,7 +383,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "a tenant ruleset is created in the authenticated realm"- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false)+ def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)def rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)[1].idtenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)@@ -446,7 +446,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 404when: "a tenant ruleset is created in a non-authenticated realm"- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false)+ tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -454,7 +454,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "an asset ruleset is created in the authenticated realm"- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false)+ def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, null, false)[0].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -517,7 +517,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 404when: "an asset ruleset is created in a non-authenticated realm"- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment2Id, false)+ assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment2Id, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -611,7 +611,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "a tenant ruleset is created in the authenticated realm"- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false)+ def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -633,7 +633,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "a tenant ruleset is created in a non-authenticated realm"- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false)+ tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -641,7 +641,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "a tenant ruleset is created in the authenticated realm"- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false)+ def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -663,7 +663,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "a tenant ruleset is created in a non-authenticated realm"- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false)+ assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -764,7 +764,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "a tenant ruleset is created in the authenticated realm"- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false)+ def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -787,7 +787,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 404when: "a tenant ruleset is created in a non-authenticated realm"- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false)+ tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -795,7 +795,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "an asset ruleset is created in the authenticated realm"- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, Values.createObject().put("visible", true), "SomeRulesCode", managerDemoSetup.apartment1Id, false)+ def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, Values.createObject().put("visible", true), "SomeRulesCode", managerDemoSetup.apartment1Id, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)def rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id, null, false)[1].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -867,7 +867,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 404when: "an asset ruleset is created in the authenticated realm but on a forbidden asset "- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment3Id, false)+ assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment3Id, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -875,7 +875,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex.response.status == 403when: "an asset ruleset is created in a non-authenticated realm"- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false)+ assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovyindex 2b5daf01f..3481283b8 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy@@ -78,8 +78,9 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {and: "some rules"Ruleset ruleset = new TenantRuleset("Demo Apartment - All Lights Off", Ruleset.Lang.JSON, getClass().getResource("/org/openremote/test/rules/BasicJsonRules.json").text,- keycloakDemoSetup.tenantA.realm- , false+ keycloakDemoSetup.tenantA.realm,+ false,+ false)ruleset = rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovyindex e0ae05d73..419624b6e 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy@@ -36,7 +36,9 @@ class ResidenceAllLightsOffTest extends Specification implements ManagerContaineand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - All Lights Off", Ruleset.Lang.JAVASCRIPT, getClass().getResource("/demo/rules/DemoResidenceAllLightsOff.js").text,- managerDemoSetup.apartment2Id, false+ managerDemoSetup.apartment2Id,+ false,+ false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovyindex e2d515645..b62cc15bb 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy@@ -39,7 +39,9 @@ class ResidenceAutoVentilationTest extends Specification implements ManagerContaand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Auto Ventilation", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceAutoVentilation.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovyindex a224762c7..70c6dd126 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy@@ -81,7 +81,9 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCoand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Notify Alarm Trigger", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovyindex 7fb900864..77d6d5c69 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy@@ -38,7 +38,9 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerConand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Presence Detection with motion and CO2 sensors", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -170,7 +172,9 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerConand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Presence Detection with motion sensor", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovyindex 6799aa5ae..3413ddce2 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy@@ -38,7 +38,9 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainerand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -166,7 +168,9 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainerand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -262,7 +266,9 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainerand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -382,7 +388,9 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainerand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)@@ -479,7 +487,9 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainerand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovyindex 589863926..9d8955f81 100644--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy@@ -41,7 +41,9 @@ class ResidenceVacationModeTest extends Specification implements ManagerContaineand: "some rules"Ruleset ruleset = new AssetRuleset("Demo Apartment - Vacation Mode", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceVacationMode.groovy").text,- managerDemoSetup.apartment1Id, false+ managerDemoSetup.apartment1Id,+ false,+ false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/resources/org/openremote/test/rules/BasicLoopingErrorRules.groovy b/test/src/test/resources/org/openremote/test/rules/BasicLoopingErrorRules.groovynew file mode 100644index 000000000..320d229e4--- /dev/null+++ b/test/src/test/resources/org/openremote/test/rules/BasicLoopingErrorRules.groovy@@ -0,0 +1,17 @@+package org.openremote.test.rules++import org.openremote.manager.rules.RulesBuilder++RulesBuilder rules = binding.rules++rules.add()+ .name("Another radial location predicate")+ .when(+ { facts ->+ true+ })+ .then(+ { facts ->+ facts.put("fired!")+ })+