Skip to content

armgit / core

Public Imported from GitHub
0

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

Added support for querying rulesets by language

Rich Turner9271daebbb1b
diff --git a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListActivity.java b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListActivity.java
index 6bbe7a5c2..0af1fbc7d 100644
--- a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListActivity.java
+++ b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListActivity.java
@@ -114,7 +114,7 @@ public class AssetRulesListActivity
environment.getApp().getRequests().sendAndReturn(
assetRulesetArrayMapper,
- params -> rulesResource.getAssetRulesets(params, assetId, false),
+ params -> rulesResource.getAssetRulesets(params, assetId, null, false),
200,
results -> view.setRulesets(new ArrayList<>(Arrays.asList(results)))
);
diff --git a/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListActivity.java b/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListActivity.java
index defae1fcf..48a0f3887 100644
--- a/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListActivity.java
+++ b/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListActivity.java
@@ -78,7 +78,7 @@ public class GlobalRulesListActivity
environment.getApp().getRequests().sendAndReturn(
globalRulesetArrayMapper,
- requestParams -> rulesResource.getGlobalRulesets(requestParams, false),
+ requestParams -> rulesResource.getGlobalRulesets(requestParams, null, false),
200,
results -> view.setRulesets(new ArrayList<>(Arrays.asList(results)))
);
diff --git a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListActivity.java b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListActivity.java
index 31c751060..a4455866b 100644
--- a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListActivity.java
+++ b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListActivity.java
@@ -115,7 +115,7 @@ public class TenantRulesListActivity
environment.getApp().getRequests().sendAndReturn(
tenantRulesetArrayMapper,
- params -> rulesResource.getTenantRulesets(params, realm, false),
+ params -> rulesResource.getTenantRulesets(params, realm, null, false),
200,
results -> view.setRulesets(new ArrayList<>(Arrays.asList(results)))
);
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
index 0b6df9235..061020b58 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
@@ -118,12 +118,12 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, boolean fullyPopulate) {
+ public GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, Ruleset.Lang language, boolean fullyPopulate) {
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- List<GlobalRuleset> result = rulesetStorageService.findGlobalRulesets(false, fullyPopulate);
+ List<GlobalRuleset> result = rulesetStorageService.findGlobalRulesets(false, language, fullyPopulate);
// Try and retrieve transient status and error data
result.forEach(ruleset ->
@@ -139,7 +139,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, String realmId, boolean fullyPopulate) {
+ public TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, String realmId, Ruleset.Lang language, boolean fullyPopulate) {
if (isAuthenticated() && !isRealmAccessibleByUser(realmId)) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
@@ -147,7 +147,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
boolean publicOnly = !isAuthenticated() || isRestrictedUser() | !hasResourceRole(ClientRole.READ_RULES.getValue(), Constants.KEYCLOAK_CLIENT_ID);
- List<TenantRuleset> result = rulesetStorageService.findTenantRulesets(realmId, publicOnly, false, fullyPopulate);
+ List<TenantRuleset> result = rulesetStorageService.findTenantRulesets(realmId, publicOnly, false, language, fullyPopulate);
// Try and retrieve transient status and error data
result.forEach(ruleset ->
@@ -163,7 +163,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, String assetId, boolean fullyPopulate) {
+ public AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, String assetId, Ruleset.Lang language, boolean fullyPopulate) {
Asset asset = assetStorageService.find(assetId, false);
if (asset == null)
return new AssetRuleset[0];
@@ -174,7 +174,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
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, false, fullyPopulate);
+ List<AssetRuleset> result = rulesetStorageService.findAssetRulesets(asset.getRealm(), assetId, publicOnly, false, language, fullyPopulate);
// Try and retrieve transient status and error data
result.forEach(ruleset ->
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
index 4d41726bf..fb1b24232 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -214,11 +214,11 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
}
LOG.info("Deploying global rulesets");
- rulesetStorageService.findGlobalRulesets(true, true).forEach(this::deployGlobalRuleset);
+ rulesetStorageService.findGlobalRulesets(true, null, true).forEach(this::deployGlobalRuleset);
LOG.info("Deploying tenant rulesets");
tenants = identityService.getIdentityProvider().getTenants();
- rulesetStorageService.findTenantRulesets(false, true, true)
+ rulesetStorageService.findTenantRulesets(false, true, null, true)
.stream()
.filter(rd ->
Arrays.stream(tenants)
@@ -227,7 +227,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
LOG.info("Deploying asset rulesets");
// Group by asset ID then tenant and check tenant is enabled
- deployAssetRulesets(rulesetStorageService.findAssetRulesets(null, null, false, true, true));
+ deployAssetRulesets(rulesetStorageService.findAssetRulesets(null, null, false, true, null, true));
LOG.info("Loading all assets with fact attributes to initialize state of rules engines");
Stream<Pair<Asset, Stream<AssetAttribute>>> assetRuleAttributes = findRuleStateAttributes();
@@ -344,11 +344,11 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
} else {
// Create tenant rules engines for this tenant if it has any rulesets
rulesetStorageService
- .findTenantRulesets(tenant.getRealm(), false, true, true)
+ .findTenantRulesets(tenant.getRealm(), false, true, null, true)
.forEach(this::deployTenantRuleset);
// Create any asset rules engines for assets in this realm that have rulesets
- deployAssetRulesets(rulesetStorageService.findAssetRulesetsByRealm(tenant.getRealm(), false, true, true));
+ deployAssetRulesets(rulesetStorageService.findAssetRulesetsByRealm(tenant.getRealm(), false, true, null, true));
}
});
}
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
index ec4a39e78..7bc1a3f91 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
@@ -70,7 +70,7 @@ public class RulesetStorageService implements ContainerService {
}
- public List<GlobalRuleset> findGlobalRulesets(boolean onlyEnabled, boolean fullyPopulate) {
+ 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";
@@ -84,21 +84,31 @@ public class RulesetStorageService implements ContainerService {
query += "and rs.enabled = true ";
}
+ if (language != null) {
+ query += "and rs.lang = :lang ";
+ }
+
query += "order by rs.createdOn asc";
String finalQuery = query;
- return persistenceService.doReturningTransaction(entityManager ->
- entityManager.createQuery(
+ return persistenceService.doReturningTransaction(entityManager -> {
+ TypedQuery<GlobalRuleset> qry = entityManager.createQuery(
finalQuery,
GlobalRuleset.class
- ).getResultList()
- );
+ );
+
+ if (language != null) {
+ qry.setParameter("lang", language);
+ }
+
+ return qry.getResultList();
+ });
}
- public List<TenantRuleset> findTenantRulesets(boolean onlyPublic, boolean onlyEnabled, boolean fullyPopulate) {
- return findTenantRulesets(null, onlyPublic, onlyEnabled, fullyPopulate);
+ public List<TenantRuleset> findTenantRulesets(boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
+ return findTenantRulesets(null, onlyPublic, onlyEnabled, language, fullyPopulate);
}
- public List<TenantRuleset> findTenantRulesets(String realm, boolean onlyPublic, boolean onlyEnabled, boolean fullyPopulate) {
+ public List<TenantRuleset> findTenantRulesets(String realm, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
String query = "select new org.openremote.model.rules.TenantRuleset(" +
"rs.id, rs.version, rs.createdOn, rs.lastModified, rs.enabled, rs.name, rs.lang";
@@ -123,6 +133,10 @@ public class RulesetStorageService implements ContainerService {
query += "and rs.enabled = true ";
}
+ if (language != null) {
+ query += "and rs.lang = :lang ";
+ }
+
query += "order by rs.createdOn asc";
String finalQuery = query;
@@ -134,18 +148,22 @@ public class RulesetStorageService implements ContainerService {
if (includeRealm) {
qry.setParameter("realm", realm);
}
+ if (language != null) {
+ qry.setParameter("lang", language);
+ }
+
return qry.getResultList();
}
);
}
- public List<AssetRuleset> findAssetRulesetsByRealm(String realm, boolean onlyPublic, boolean onlyEnabled, boolean fullyPopulate) {
- return findAssetRulesets(realm, null, onlyPublic, onlyEnabled, fullyPopulate);
+ public List<AssetRuleset> findAssetRulesetsByRealm(String realm, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
+ return findAssetRulesets(realm, null, onlyPublic, onlyEnabled, language, fullyPopulate);
}
- public List<AssetRuleset> findAssetRulesetsByAssetId(String assetId, boolean onlyPublic, boolean onlyEnabled, boolean fullyPopulate) {
- return findAssetRulesets(null, assetId, onlyPublic, onlyEnabled, fullyPopulate);
+ public List<AssetRuleset> findAssetRulesetsByAssetId(String assetId, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
+ return findAssetRulesets(null, assetId, onlyPublic, onlyEnabled, language, fullyPopulate);
}
- public List<AssetRuleset> findAssetRulesets(String realm, String assetId, boolean onlyPublic, boolean onlyEnabled, boolean fullyPopulate) {
+ public List<AssetRuleset> findAssetRulesets(String realm, String assetId, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
String query = "select new org.openremote.model.rules.AssetRuleset(" +
"rs.id, rs.version, rs.createdOn, rs.lastModified, rs.enabled, rs.name, rs.lang";
@@ -175,6 +193,10 @@ public class RulesetStorageService implements ContainerService {
query += "and rs.enabled = true ";
}
+ if (language != null) {
+ query += "and rs.lang = :lang ";
+ }
+
query += "order by rs.createdOn asc";
String finalQuery = query;
@@ -191,6 +213,9 @@ public class RulesetStorageService implements ContainerService {
if (includeAssetId) {
qry.setParameter("assetId", assetId);
}
+ if (language != null) {
+ qry.setParameter("lang", language);
+ }
return qry.getResultList();
}
diff --git a/model/src/main/java/org/openremote/model/rules/RulesResource.java b/model/src/main/java/org/openremote/model/rules/RulesResource.java
index dd7b0f312..2c70aba02 100644
--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java
+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java
@@ -73,7 +73,7 @@ public interface RulesResource {
@SuccessStatusCode(200)
@RolesAllowed({"read:rules"})
@SuppressWarnings("unusable-by-js")
- GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, @QueryParam("fullyPopulate") boolean fullyPopulate);
+ GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, @QueryParam("language")Ruleset.Lang language, @QueryParam("fullyPopulate") boolean fullyPopulate);
/**
* Retrieve rules of a tenant. The superuser can retrieve rules of all realms, a 403 status is returned if a regular
@@ -85,7 +85,7 @@ public interface RulesResource {
@Produces(APPLICATION_JSON)
@SuccessStatusCode(200)
@SuppressWarnings("unusable-by-js")
- TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @QueryParam("fullyPopulate") boolean fullyPopulate);
+ TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @QueryParam("language")Ruleset.Lang language, @QueryParam("fullyPopulate") boolean fullyPopulate);
/**
* Retrieve rules of an asset. The superuser can retrieve rules of all realms and assets, a 403 status is returned
@@ -97,7 +97,7 @@ public interface RulesResource {
@Produces(APPLICATION_JSON)
@SuccessStatusCode(200)
@SuppressWarnings("unusable-by-js")
- AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId, @QueryParam("fullyPopulate") boolean fullyPopulate);
+ AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId, @QueryParam("language")Ruleset.Lang language, @QueryParam("fullyPopulate") boolean fullyPopulate);
/* ################################################################################################# */
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
index 1a5e04562..51a8fe2c3 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
@@ -55,7 +55,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
/* ############################################## READ ####################################### */
when: "the global rules are retrieved"
- def ruleDefinitions = rulesetResource.getGlobalRulesets(null, false)
+ def ruleDefinitions = rulesetResource.getGlobalRulesets(null, null, false)
then: "result should match"
ruleDefinitions.length == 2
@@ -64,7 +64,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ruleDefinitions[0].rules == null // Don't retrieve the (large) rules data when getting a list of rule definitions
when: "some tenant rules are retrieved"
- ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, false)
+ ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)
then: "result should match"
ruleDefinitions.length == 1
@@ -72,7 +72,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ruleDefinitions[0].lang == GROOVY
when: "some tenant rules in a non-authenticated realm are retrieved"
- ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, false)
+ ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, null, false)
then: "result should match"
ruleDefinitions.length == 1
@@ -80,7 +80,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ruleDefinitions[0].enabled
when: "some asset rules are retrieved"
- ruleDefinitions = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, false)
+ ruleDefinitions = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, null, false)
then: "result should match"
ruleDefinitions.length == 1
@@ -92,7 +92,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "global ruleset is created"
def globalRuleset = new GlobalRuleset("Test global definition", GROOVY, "SomeRulesCode")
rulesetResource.createGlobalRuleset(null, globalRuleset)
- def rulesetId = rulesetResource.getGlobalRulesets(null, false)[2].id
+ def rulesetId = rulesetResource.getGlobalRulesets(null, null, false)[2].id
globalRuleset = rulesetResource.getGlobalRuleset(null, rulesetId)
def lastModified = globalRuleset.lastModified
@@ -137,7 +137,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "a tenant ruleset is created in the authenticated realm"
def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false)
rulesetResource.createTenantRuleset(null, tenantRuleset)
- rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, false)[1].id
+ rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)[1].id
tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
lastModified = tenantRuleset.lastModified
@@ -200,7 +200,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "a tenant ruleset is created in a non-authenticated realm"
tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false)
rulesetResource.createTenantRuleset(null, tenantRuleset)
- rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, false)[1].id
+ rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, null, false)[1].id
tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
lastModified = tenantRuleset.lastModified
@@ -216,7 +216,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "an asset ruleset is created in the authenticated realm"
def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false)
rulesetResource.createAssetRuleset(null, assetRuleset)
- rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, false)[0].id
+ rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, null, false)[0].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
lastModified = assetRuleset.lastModified
@@ -279,7 +279,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "an asset ruleset is created in a non-authenticated realm"
assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment2Id, false)
rulesetResource.createAssetRuleset(null, assetRuleset)
- rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, false)[1].id
+ rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, null, false)[1].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
lastModified = assetRuleset.lastModified
@@ -329,28 +329,28 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
/* ############################################## READ ####################################### */
when: "the global rules are retrieved"
- rulesetResource.getGlobalRulesets(null, false)
+ rulesetResource.getGlobalRulesets(null, null, false)
then: "access should be forbidden"
WebApplicationException ex = thrown()
ex.response.status == 403
when: "some tenant rules are retrieved"
- def ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, false)
+ def ruleDefinitions = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)
then: "result should match"
ruleDefinitions.length == 1
ruleDefinitions[0].name == "Some master tenant demo rules"
when: "some tenant rules in a non-authenticated realm are retrieved"
- rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, false)
+ rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, null, false)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
when: "some asset rules in a non-authenticated realm are retrieved"
- rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, false)
+ rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, null, false)
then: "access should be forbidden"
ex = thrown()
@@ -383,7 +383,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "a tenant ruleset is created in the authenticated realm"
def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false)
rulesetResource.createTenantRuleset(null, tenantRuleset)
- def rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, false)[1].id
+ def rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)[1].id
tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
def lastModified = tenantRuleset.lastModified
@@ -454,7 +454,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "an asset ruleset is created in the authenticated realm"
def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false)
rulesetResource.createAssetRuleset(null, assetRuleset)
- rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, false)[0].id
+ rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, null, false)[0].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
lastModified = assetRuleset.lastModified
@@ -559,27 +559,27 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
/* ############################################## READ ####################################### */
when: "the global rules are retrieved"
- rulesetResource.getGlobalRulesets(null, false)
+ rulesetResource.getGlobalRulesets(null, null, false)
then: "access should be forbidden"
WebApplicationException ex = thrown()
ex.response.status == 403
when: "some tenant rules in a non-authenticated realm are retrieved"
- rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, false)
+ rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
when: "some tenant rules in the authenticated realm are retrieved by user without rules read role"
- def rulesets = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, false)
+ def rulesets = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, null, false)
then: "no rulesets should be returned"
rulesets.length == 0
when: "some asset rules in the authenticated realm are retrieved by the user without rules read role"
- rulesets = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, false)
+ rulesets = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, null, false)
then: "no rulesets should be returned"
rulesets.length == 0
@@ -705,34 +705,34 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
/* ############################################## READ ####################################### */
when: "the global rules are retrieved"
- rulesetResource.getGlobalRulesets(null, false)
+ rulesetResource.getGlobalRulesets(null, null, false)
then: "access should be forbidden"
WebApplicationException ex = thrown()
ex.response.status == 403
when: "some tenant rules in a non-authenticated realm are retrieved"
- rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, false)
+ rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)
then: "access should be forbidden"
ex = thrown()
ex.response.status == 403
when: "some tenant rules in the authenticated realm are retrieved by the restricted user"
- def rulesets = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, false)
+ def rulesets = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, null, false)
then: "no rulesets should be returned"
rulesets.length == 0
when: "some asset rules of a protected assigned asset are retrieved"
- def ruleDefinitions = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id, false)
+ def ruleDefinitions = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id, null, false)
then: "result should match"
ruleDefinitions.length == 1
ruleDefinitions[0].name == "Some apartment 1 demo rules"
when: "some asset rules of a protected but not assigned asset are retrieved"
- rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, false)
+ rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, null, false)
then: "no rulesets should be returned"
rulesets.length == 0
@@ -795,7 +795,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
when: "an asset ruleset is created in the authenticated realm"
def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment1Id, false)
rulesetResource.createAssetRuleset(null, assetRuleset)
- def rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id, false)[1].id
+ def rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id, null, false)[1].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
def lastModified = assetRuleset.lastModified
diff --git a/ui/component/or-rules-editor/src/index.ts b/ui/component/or-rules-editor/src/index.ts
index 17b5621d1..b1a9ecf3b 100644
--- a/ui/component/or-rules-editor/src/index.ts
+++ b/ui/component/or-rules-editor/src/index.ts
@@ -1,8 +1,8 @@
-import {html, LitElement, property, customElement, TemplateResult} from 'lit-element';
+import {customElement, html, LitElement, property, TemplateResult} from 'lit-element';
import '@openremote/or-select';
import '@openremote/or-icon';
-import {Rule, JsonRulesetDefinition, Ruleset, RulesetLang, TenantRuleset, RuleActionWriteAttribute} from '@openremote/model';
+import {Rule, RuleActionWriteAttribute, RulesetLang, TenantRuleset} from '@openremote/model';
import openremote from "@openremote/core";
import rest from "@openremote/rest";
@@ -109,7 +109,7 @@ class OrRulesEditor extends LitElement {
readRules() {
- rest.api.RulesResource.getTenantRulesets(openremote.config.realm, { fullyPopulate: true }).then((response: any) => {
+ rest.api.RulesResource.getTenantRulesets(openremote.config.realm, { language: RulesetLang.JSON, fullyPopulate: true }).then((response: any) => {
if (response && response.data) {
this.rulesets = response.data;
if(this.ruleset && this.rulesets) {
@@ -133,7 +133,6 @@ class OrRulesEditor extends LitElement {
});
}
-
createRule() {
if(this.rulesets) {
diff --git a/ui/component/rest/src/main/java/JaxRsClientOnlyProcessor.java b/ui/component/rest/src/main/java/JaxRsClientOnlyProcessor.java
index b1cdab528..4e4aaa10e 100644
--- a/ui/component/rest/src/main/java/JaxRsClientOnlyProcessor.java
+++ b/ui/component/rest/src/main/java/JaxRsClientOnlyProcessor.java
@@ -39,11 +39,16 @@ public class JaxRsClientOnlyProcessor implements cz.habarta.typescript.generator
return null;
}
if (!rawClass.getName().endsWith("Resource")) {
+ String name = rawClass.getName();
String simpleName = rawClass.getSimpleName();
+ if (name.indexOf("$") > 0) {
+ simpleName = name.substring(name.lastIndexOf(".")+1).replace("$","");
+ }
if ("RequestParams".equals(simpleName)) {
simpleName = simpleName + "<any,any>";
}
simpleName = "Model." + simpleName;
+
return new Result(new TsType.VerbatimType(simpleName));
}
}