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
Implemented tenant and asset ruleset access public read flag
Rich Turner3a658e66d677
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 a34182c5d..7c60c6e1f 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(assetId);+ return new AssetRuleset(assetId, 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 33dddae63..ecb70a283 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(realm);+ return new TenantRuleset(realm, false);}@Overridediff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.javaindex d78f2f9ab..fe7cbdc99 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java@@ -23,6 +23,7 @@ import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.security.ManagerIdentityService;import org.openremote.manager.web.ManagerWebResource;+import org.openremote.model.Constants;import org.openremote.model.asset.Asset;import org.openremote.model.query.AssetQuery;import org.openremote.model.query.BaseAssetQuery;@@ -30,6 +31,7 @@ import org.openremote.model.asset.UserAsset;import org.openremote.model.http.RequestParams;import org.openremote.model.rules.*;import org.openremote.model.rules.geofence.GeofenceDefinition;+import org.openremote.model.security.ClientRole;import org.openremote.model.security.Tenant;import javax.ws.rs.BeanParam;@@ -137,10 +139,14 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour@Overridepublic TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, String realmId) {- if (!isRealmAccessibleByUser(realmId) || isRestrictedUser()) {++ if (isAuthenticated() && !isRealmAccessibleByUser(realmId)) {throw new WebApplicationException(Response.Status.FORBIDDEN);}- List<TenantRuleset> result = rulesetStorageService.findTenantRulesets(realmId);++ boolean publicOnly = !isAuthenticated() || isRestrictedUser() | !hasResourceRole(ClientRole.READ_RULES.getValue(), Constants.KEYCLOAK_CLIENT_ID);++ List<TenantRuleset> result = rulesetStorageService.findTenantRulesets(realmId, publicOnly);// Try and retrieve transient status and error dataresult.forEach(ruleset ->@@ -161,13 +167,13 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResourif (asset == null)return new AssetRuleset[0];- if (!isRealmAccessibleByUser(asset.getRealm())) {+ if (isAuthenticated() && !isRealmAccessibleByUser(asset.getRealm())) {throw new WebApplicationException(Response.Status.FORBIDDEN);}- if (isRestrictedUser() && !assetStorageService.isUserAsset(getUserId(), assetId)) {- throw new WebApplicationException(Response.Status.FORBIDDEN);- }- List<AssetRuleset> result = rulesetStorageService.findAssetRulesets(asset.getRealm(), assetId);++ boolean publicOnly = !isAuthenticated() || (isRestrictedUser() && !assetStorageService.isUserAsset(getUserId(), assetId)) || !hasResourceRole(ClientRole.READ_RULES.getValue(), Constants.KEYCLOAK_CLIENT_ID);++ List<AssetRuleset> result = rulesetStorageService.findAssetRulesets(asset.getRealm(), assetId, publicOnly);// Try and retrieve transient status and error dataresult.forEach(ruleset ->diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.javaindex 5526a9507..88674ea38 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java@@ -88,15 +88,24 @@ public class RulesetStorageService implements ContainerService {/*** The {@link Ruleset#rules} property is not populated for this query to avoid loading multiple large strings.*/- public List<TenantRuleset> findTenantRulesets(String realm) {+ public List<TenantRuleset> findTenantRulesets(String realm, boolean onlyPublic) {++ String query = "select new org.openremote.model.rules.TenantRuleset(" ++ "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.realm, rs.lang, rs.accessPublicRead" ++ ") " ++ "from TenantRuleset rs " ++ "where rs.realm = :realm ";++ if (onlyPublic) {+ query += "and rs.accessPublicRead = true ";+ }++ query += "order by rs.createdOn asc";++ String finalQuery = query;return persistenceService.doReturningTransaction(entityManager ->entityManager.createQuery(- "select new org.openremote.model.rules.TenantRuleset(" +- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.realm, rs.lang" +- ") " +- "from TenantRuleset rs " +- "where rs.realm = :realm " +- "order by rs.createdOn asc",+ finalQuery,TenantRuleset.class).setParameter("realm", realm).getResultList());@@ -105,15 +114,25 @@ public class RulesetStorageService implements ContainerService {/*** The {@link Ruleset#rules} property is not populated for this query to avoid loading multiple large strings.*/- public List<AssetRuleset> findAssetRulesets(String realm, String assetId) {+ public List<AssetRuleset> findAssetRulesets(String realm, String assetId, boolean onlyPublic) {++ String query = "select new org.openremote.model.rules.AssetRuleset(" ++ "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.assetId, rs.lang, rs.accessPublicRead" ++ ") " ++ "from AssetRuleset rs, Asset a " ++ "where rs.assetId = :assetId and rs.assetId = a.id and a.realm = :realm ";++ if (onlyPublic) {+ query += "and rs.accessPublicRead = true ";+ }++ query += "order by rs.createdOn asc";++ String finalQuery = query;+return persistenceService.doReturningTransaction(entityManager ->entityManager.createQuery(- "select new org.openremote.model.rules.AssetRuleset(" +- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.assetId, rs.lang" +- ") " +- "from AssetRuleset rs, Asset a " +- "where rs.assetId = :assetId and rs.assetId = a.id and a.realm = :realm " +- "order by rs.createdOn asc",+ finalQuery,AssetRuleset.class).setParameter("realm", realm).setParameter("assetId",assetId).getResultList()@@ -143,7 +162,7 @@ public class RulesetStorageService implements ContainerService {return persistenceService.doReturningTransaction(entityManager ->entityManager.createQuery("select new org.openremote.model.rules.TenantRuleset(" +- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.realm" ++ "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.realm, rs.accessPublicRead" +") " +"from TenantRuleset rs " +"where rs.enabled = true",@@ -159,7 +178,7 @@ public class RulesetStorageService implements ContainerService {return persistenceService.doReturningTransaction(entityManager ->entityManager.createQuery("select new org.openremote.model.rules.TenantRuleset(" +- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.realm" ++ "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.realm, rs.accessPublicRead" +") " +"from TenantRuleset rs " +"where rs.enabled = true and rs.realm = :realm",@@ -176,7 +195,7 @@ public class RulesetStorageService implements ContainerService {entityManager.createQuery("select new org.openremote.model.rules.AssetRuleset(" +"rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.assetId, a.realm" +- ") " ++ ", rs.accessPublicRead) " +"from AssetRuleset rs, Asset a " +"where rs.assetId = a.id " +"and rs.enabled = true ",@@ -192,7 +211,7 @@ public class RulesetStorageService implements ContainerService {return persistenceService.doReturningTransaction(entityManager -> {List<AssetRuleset> result = entityManager.createQuery("select new org.openremote.model.rules.AssetRuleset(" +- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.assetId, a.realm" ++ "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.assetId, a.realm, rs.accessPublicRead" +") " +"from AssetRuleset rs, Asset a " +"where rs.assetId = a.id " +@@ -212,7 +231,7 @@ public class RulesetStorageService implements ContainerService {return persistenceService.doReturningTransaction(entityManager ->entityManager.createQuery("select new org.openremote.model.rules.AssetRuleset(" +- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.assetId, a.realm" ++ "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.name, rs.enabled, rs.rules, rs.lang, rs.assetId, a.realm, rs.accessPublicRead" +") " +"from AssetRuleset rs, Asset a " +"where rs.assetId = a.id and a.realm = :realm " +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 196b1c5f2..7c7295a16 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@@ -845,7 +845,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {"Camera3_Rules",camera3Asset.getId(),IOUtils.toString(getClass().getResource("/demo/rules/DemoSmartCityCamera.groovy"), "UTF-8"),- GROOVY);+ GROOVY, false);camera3Rules = rulesetStorageService.merge(camera3Rules);Asset light3Asset = createDemoLightAsset("Light3", assetArea3);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 09f39c961..54aa2b5a7 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", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY+ "Demo Residence - Presence Detection with motion and CO2 sensors", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY, 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", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY+ "Demo Residence - Vacation Mode", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY, 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", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY+ "Demo Residence - Auto Ventilation", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY, 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", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY+ "Demo Residence - Notify Alarm Trigger", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY, 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", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY+ "Demo Residence - Smart Start Switch", managerDemoSetup.apartment1Id, rules, Ruleset.Lang.GROOVY, 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", managerDemoSetup.apartment2Id, rules, Ruleset.Lang.JAVASCRIPT+ "Demo Residence - All Lights Off", managerDemoSetup.apartment2Id, rules, Ruleset.Lang.JAVASCRIPT, 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", keycloakDemoSetup.tenantA.getRealm(), rules, Ruleset.Lang.GROOVY+ "Demo Console Location", keycloakDemoSetup.tenantA.getRealm(), rules, Ruleset.Lang.GROOVY, true);tenantARulesetId = rulesetStorageService.merge(ruleset).getId();}diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.javaindex fbe521167..233ce4b18 100644--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebResource.java@@ -36,7 +36,7 @@ public class ManagerWebResource extends WebResource {}public boolean isRestrictedUser() {- return identityService.getIdentityProvider().isRestrictedUser(getUserId());+ return isAuthenticated() && identityService.getIdentityProvider().isRestrictedUser(getUserId());}public Tenant getAuthenticatedTenant() {diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20190304_04__AddRulesetPublicRead.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20190304_04__AddRulesetPublicRead.sqlnew file mode 100644index 000000000..73d7dfe4f--- /dev/null+++ b/manager/src/main/resources/org/openremote/manager/setup/database/V20190304_04__AddRulesetPublicRead.sql@@ -0,0 +1,14 @@++/*+ Adds public read flag to rulesets+ */++-- UPDATE ASSET_RULESET++ALTER TABLE ASSET_RULESET+ ADD COLUMN ACCESS_PUBLIC_READ boolean not null DEFAULT false;+++-- UPDATE TENANT_RULESET+ALTER TABLE TENANT_RULESET+ ADD COLUMN ACCESS_PUBLIC_READ 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 828c09c30..eb7d8791b 100644--- a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java@@ -38,29 +38,35 @@ public class AssetRuleset extends Ruleset {@Column(name = "ASSET_ID", length = 22, nullable = false, columnDefinition = "char(22)")protected String assetId;+ @Column(name = "ACCESS_PUBLIC_READ", nullable = false)+ protected boolean accessPublicRead;+@Transientprotected String realm;public AssetRuleset() {}- public AssetRuleset(String assetId) {+ public AssetRuleset(String assetId, boolean accessPublicRead) {this.assetId = assetId;+ this.accessPublicRead = accessPublicRead;}- public AssetRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String assetId, Lang lang) {- this(id, version, createdOn, lastModified, name, enabled, null, lang, assetId, null);+ public AssetRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String assetId, Lang lang, boolean accessPublicRead) {+ this(id, version, createdOn, lastModified, name, enabled, null, lang, assetId, null, accessPublicRead);}- public AssetRuleset(String name, String assetId, String rules, Lang lang) {+ public AssetRuleset(String name, String assetId, String rules, Lang lang, boolean accessPublicRead) {super(name, rules, lang);this.assetId = assetId;+ this.accessPublicRead = accessPublicRead;}- public AssetRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String rules, Lang lang, String assetId, String realm) {+ public AssetRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String rules, Lang lang, String assetId, String realm, boolean accessPublicRead) {super(id, version, createdOn, lastModified, name, enabled, rules, lang);this.assetId = assetId;this.realm = realm;+ this.accessPublicRead = accessPublicRead;}public String getAssetId() {@@ -79,6 +85,14 @@ public class AssetRuleset extends Ruleset {this.realm = realm;}+ public boolean isAccessPublicRead() {+ return accessPublicRead;+ }++ public void setAccessPublicRead(boolean accessPublicRead) {+ this.accessPublicRead = accessPublicRead;+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +@@ -91,6 +105,7 @@ public class AssetRuleset extends Ruleset {", enabled='" + enabled + '\'' +", realm='" + realm + '\'' +", assetId='" + assetId + '\'' ++ ", accessPublicRead='" + accessPublicRead + '\'' +'}';}}diff --git a/model/src/main/java/org/openremote/model/rules/RulesResource.java b/model/src/main/java/org/openremote/model/rules/RulesResource.javaindex 06ab2482b..0702aaf7f 100644--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java@@ -84,7 +84,6 @@ public interface RulesResource {@Path("tenant/for/{realm}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})@SuppressWarnings("unusable-by-js")TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, @PathParam("realm") String realm);@@ -97,7 +96,6 @@ public interface RulesResource {@Path("asset/for/{assetId}")@Produces(APPLICATION_JSON)@SuccessStatusCode(200)- @RolesAllowed({"read:rules"})@SuppressWarnings("unusable-by-js")AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId);diff --git a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java b/model/src/main/java/org/openremote/model/rules/TenantRuleset.javaindex b7e758dfa..4a7cfab71 100644--- a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java+++ b/model/src/main/java/org/openremote/model/rules/TenantRuleset.java@@ -37,27 +37,32 @@ public class TenantRuleset extends Ruleset {@Column(name = "REALM", nullable = false)protected String realm;+ @Column(name = "ACCESS_PUBLIC_READ", nullable = false)+ protected boolean accessPublicRead;+public TenantRuleset() {}- public TenantRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String realm, Lang lang) {+ public TenantRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String realm, Lang lang, boolean accessPublicRead) {super(id, version, createdOn, lastModified, name, enabled, lang);this.realm = realm;+ this.accessPublicRead = accessPublicRead;}- public TenantRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String rules, Lang lang, String realm) {+ public TenantRuleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String rules, Lang lang, String realm, boolean accessPublicRead) {super(id, version, createdOn, lastModified, name, enabled, rules, lang);this.realm = realm;+ this.accessPublicRead = accessPublicRead;}- public TenantRuleset(String realm) {- this(null, realm, null, Lang.GROOVY);-+ public TenantRuleset(String realm, boolean accessPublicRead) {+ this(null, realm, null, Lang.GROOVY, accessPublicRead);}- public TenantRuleset(String name, String realm, String rules, Lang lang) {+ public TenantRuleset(String name, String realm, String rules, Lang lang, boolean accessPublicRead) {super(name, rules, lang);this.realm = realm;+ this.accessPublicRead = accessPublicRead;}public String getRealm() {@@ -68,6 +73,14 @@ public class TenantRuleset extends Ruleset {this.realm = realm;}+ public boolean isAccessPublicRead() {+ return accessPublicRead;+ }++ public void setAccessPublicRead(boolean accessPublicRead) {+ this.accessPublicRead = accessPublicRead;+ }+@Overridepublic String toString() {return getClass().getSimpleName() + "{" +@@ -79,6 +92,7 @@ public class TenantRuleset extends Ruleset {", lastModified='" + lastModified + '\'' +", enabled='" + enabled + '\'' +", realm='" + realm + '\'' ++ ", accessPublicRead='" + accessPublicRead + '\'' +'}';}}diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovyindex 0dd807d39..2df43746a 100644--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy@@ -100,7 +100,7 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {"Demo Tenant A - Console Location",keycloakDemoSetup.tenantA.realm,getClass().getResource("/demo/rules/DemoConsoleLocation.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(ruleset)@@ -503,7 +503,7 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {"Console test location predicates",testUser3Console1.parentId,getClass().getResource("/org/openremote/test/rules/BasicLocationPredicates.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, 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 a1b32305e..866f19b12 100644--- a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy+++ b/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy@@ -38,7 +38,7 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine"Failure Ruleset",managerDemoSetup.apartment2Id,getClass().getResource("/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)ruleset = rulesetStorageService.merge(ruleset)@@ -74,7 +74,7 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine"Failure Ruleset",managerDemoSetup.apartment2Id,getClass().getResource("/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)ruleset = rulesetStorageService.merge(ruleset)@@ -110,7 +110,7 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine"Failure Ruleset",managerDemoSetup.apartment2Id,getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)ruleset = rulesetStorageService.merge(ruleset)@@ -146,7 +146,7 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine"Failure Ruleset",managerDemoSetup.apartment2Id,getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, 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 5a3c21ce1..fc3102222 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy@@ -76,7 +76,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer"Some more tenantA tenant rules",keycloakDemoSetup.tenantA.realm,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text,- GROOVY+ GROOVY, false)rulesetStorageService.merge(ruleset)@@ -95,7 +95,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer"Some more tenantB tenant rules",keycloakDemoSetup.tenantB.realm,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text,- GROOVY+ GROOVY, false)rulesetStorageService.merge(ruleset)diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovyindex 82cfabd46..5fd59edec 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy@@ -54,7 +54,7 @@ class BasicRulesImport {"Some master tenant demo rules",keycloakDemoSetup.masterTenant.realm,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- GROOVY+ GROOVY, false)masterRulesetId = rulesetStorageService.merge(ruleset).id@@ -62,7 +62,7 @@ class BasicRulesImport {"Some tenantA tenant demo rules",keycloakDemoSetup.tenantA.realm,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- GROOVY+ GROOVY, false)tenantARulesetId = rulesetStorageService.merge(ruleset).id@@ -70,7 +70,7 @@ class BasicRulesImport {"Some tenantB tenant demo rules",keycloakDemoSetup.tenantB.realm,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- GROOVY+ GROOVY, false)ruleset.setEnabled(false)tenantBRulesetId = rulesetStorageService.merge(ruleset).id@@ -79,7 +79,7 @@ class BasicRulesImport {"Some apartment 1 demo rules",managerDemoSetup.apartment1Id,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- GROOVY+ GROOVY, false)ruleset.setEnabled(false)apartment1RulesetId = rulesetStorageService.merge(ruleset).id@@ -88,7 +88,7 @@ class BasicRulesImport {"Some apartment 2 demo rules",managerDemoSetup.apartment2Id,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- GROOVY+ GROOVY, false)apartment2RulesetId = rulesetStorageService.merge(ruleset).id@@ -96,7 +96,7 @@ class BasicRulesImport {"Some apartment 3 demo rules",managerDemoSetup.apartment3Id,getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,- GROOVY+ GROOVY, 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 450c75c8e..84a55ac1c 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy@@ -132,7 +132,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer"Some Smart Building asset rules",managerDemoSetup.smartBuildingId,getClass().getResource("/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(assetRuleset)RulesEngine smartHomeEngine = null@@ -380,7 +380,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer"Some broken test rules",keycloakDemoSetup.tenantA.realm,getClass().getResource("/org/openremote/test/rules/BasicBrokenRules.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, 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 4b9faf7d3..6a8a1dd41 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy@@ -135,7 +135,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", keycloakDemoSetup.masterTenant.realm, "SomeRulesCode", GROOVY)+ def tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.masterTenant.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm)[1].idtenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)@@ -198,7 +198,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", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY)+ tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm)[1].idtenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)@@ -214,7 +214,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", managerDemoSetup.smartOfficeId, "SomeRulesCode", GROOVY)+ def assetRuleset = new AssetRuleset("Test asset definition", managerDemoSetup.smartOfficeId, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId)[0].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -277,7 +277,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", managerDemoSetup.apartment2Id, "SomeRulesCode", GROOVY)+ assetRuleset = new AssetRuleset("Test asset definition", managerDemoSetup.apartment2Id, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id)[1].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -381,7 +381,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", keycloakDemoSetup.masterTenant.realm, "SomeRulesCode", GROOVY)+ def tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.masterTenant.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)def rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm)[1].idtenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)@@ -444,7 +444,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", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY)+ tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -452,7 +452,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", managerDemoSetup.smartOfficeId, "SomeRulesCode", GROOVY)+ def assetRuleset = new AssetRuleset("Test asset definition", managerDemoSetup.smartOfficeId, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId)[0].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -515,7 +515,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", managerDemoSetup.apartment2Id, "SomeRulesCode", GROOVY)+ assetRuleset = new AssetRuleset("Test asset definition", managerDemoSetup.apartment2Id, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -572,19 +572,17 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex = thrown()ex.response.status == 403- when: "some tenant rules in the authenticated realm are retrieved"- rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm)+ when: "some tenant rules in the authenticated realm are retrieved by user without rules read role"+ def rulesets = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm)- then: "access should be forbidden"- ex = thrown()- ex.response.status == 403+ then: "no rulesets should be returned"+ rulesets.length == 0- when: "some asset rules in the authenticated realm are retrieved"- rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id)+ when: "some asset rules in the authenticated realm are retrieved by the user without rules read role"+ rulesets = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id)- then: "access should be forbidden"- ex = thrown()- ex.response.status == 403+ then: "no rulesets should be returned"+ rulesets.length == 0/* ############################################## WRITE ####################################### */@@ -611,7 +609,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", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY)+ def tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -633,7 +631,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", keycloakDemoSetup.tenantB.realm, "SomeRulesCode", GROOVY)+ tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.tenantB.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -641,7 +639,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", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY)+ def assetRuleset = new AssetRuleset("Test asset definition", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -663,7 +661,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", keycloakDemoSetup.tenantB.realm, "SomeRulesCode", GROOVY)+ assetRuleset = new AssetRuleset("Test asset definition", keycloakDemoSetup.tenantB.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -720,12 +718,11 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerex = thrown()ex.response.status == 403- when: "some tenant rules in the authenticated realm are retrieved"- rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm)+ when: "some tenant rules in the authenticated realm are retrieved by the restricted user"+ def rulesets = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm)- then: "access should be forbidden"- ex = thrown()- ex.response.status == 403+ then: "no rulesets should be returned"+ rulesets.length == 0when: "some asset rules of a protected assigned asset are retrieved"def ruleDefinitions = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id)@@ -737,9 +734,8 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainerwhen: "some asset rules of a protected but not assigned asset are retrieved"rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id)- then: "access should be forbidden"- ex = thrown()- ex.response.status == 403+ then: "no rulesets should be returned"+ rulesets.length == 0/* ############################################## WRITE ####################################### */@@ -766,7 +762,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", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY)+ def tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.tenantA.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -789,7 +785,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", keycloakDemoSetup.tenantB.realm, "SomeRulesCode", GROOVY)+ tenantRuleset = new TenantRuleset("Test tenant definition", keycloakDemoSetup.tenantB.realm, "SomeRulesCode", GROOVY, false)rulesetResource.createTenantRuleset(null, tenantRuleset)then: "access should be forbidden"@@ -797,7 +793,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", managerDemoSetup.apartment1Id, "SomeRulesCode", GROOVY)+ def assetRuleset = new AssetRuleset("Test asset definition", managerDemoSetup.apartment1Id, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)def rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id)[1].idassetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)@@ -868,7 +864,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", managerDemoSetup.apartment3Id, "SomeRulesCode", GROOVY)+ assetRuleset = new AssetRuleset("Test asset definition", managerDemoSetup.apartment3Id, "SomeRulesCode", GROOVY, false)rulesetResource.createAssetRuleset(null, assetRuleset)then: "access should be forbidden"@@ -876,7 +872,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", managerDemoSetup.smartOfficeId, "SomeRulesCode", GROOVY)+ assetRuleset = new AssetRuleset("Test asset definition", managerDemoSetup.smartOfficeId, "SomeRulesCode", GROOVY, 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 3c477473a..6ec011598 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@@ -77,7 +77,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {"Demo Apartment - All Lights Off",keycloakDemoSetup.tenantA.realm,getClass().getResource("/org/openremote/test/rules/BasicJsonRules.json").text,- Ruleset.Lang.JSON+ Ruleset.Lang.JSON, false)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 418b71334..1c15827e4 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@@ -38,7 +38,7 @@ class ResidenceAllLightsOffTest extends Specification implements ManagerContaine"Demo Apartment - All Lights Off",managerDemoSetup.apartment2Id,getClass().getResource("/demo/rules/DemoResidenceAllLightsOff.js").text,- Ruleset.Lang.JAVASCRIPT+ Ruleset.Lang.JAVASCRIPT, 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 2e4261b54..709be4e70 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@@ -41,7 +41,7 @@ class ResidenceAutoVentilationTest extends Specification implements ManagerConta"Demo Apartment - Auto Ventilation",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceAutoVentilation.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, 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 b9ccc2a3f..68f9f87df 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@@ -83,7 +83,7 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCo"Demo Apartment - Notify Alarm Trigger",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, 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 e5e32bd9e..2a77d2cd9 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@@ -40,7 +40,7 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerCon"Demo Apartment - Presence Detection with motion and CO2 sensors",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(ruleset)@@ -174,7 +174,7 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerCon"Demo Apartment - Presence Detection with motion sensor",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, 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 a6ca6857b..a3e198914 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@@ -40,7 +40,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer"Demo Apartment - Smart Start",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(ruleset)@@ -170,7 +170,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer"Demo Apartment - Smart Start",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(ruleset)@@ -268,7 +268,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer"Demo Apartment - Smart Start",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(ruleset)@@ -390,7 +390,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer"Demo Apartment - Smart Start",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(ruleset)@@ -489,7 +489,7 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer"Demo Apartment - Smart Start",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, 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 9dbad61bb..c1bf2f76e 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@@ -43,7 +43,7 @@ class ResidenceVacationModeTest extends Specification implements ManagerContaine"Demo Apartment - Vacation Mode",managerDemoSetup.apartment1Id,getClass().getResource("/demo/rules/DemoResidenceVacationMode.groovy").text,- Ruleset.Lang.GROOVY+ Ruleset.Lang.GROOVY, false)rulesetStorageService.merge(ruleset)