Skip to content

armgit / core

Public Imported from GitHub
0

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

Updated RulesResource to support multiple languages in get queries

Rich Turner9d7c33cc3288
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 d16063b8d..e6bf97bab 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, Ruleset.Lang language, boolean fullyPopulate) {
+ public GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, List<Ruleset.Lang> languages, boolean fullyPopulate) {
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- List<GlobalRuleset> result = rulesetStorageService.findAll(GlobalRuleset.class, new RulesetQuery().setLanguage(language).setFullyPopulate(fullyPopulate));
+ List<GlobalRuleset> result = rulesetStorageService.findAll(GlobalRuleset.class, new RulesetQuery().setLanguages(languages.toArray(new Ruleset.Lang[0])).setFullyPopulate(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 realm, Ruleset.Lang language, boolean fullyPopulate) {
+ public TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, String realm, List<Ruleset.Lang> languages, boolean fullyPopulate) {
if (isAuthenticated() && !isRealmAccessibleByUser(realm)) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
@@ -151,7 +151,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
TenantRuleset.class,
new RulesetQuery().
setRealm(realm)
- .setLanguage(language)
+ .setLanguages(languages.toArray(new Ruleset.Lang[0]))
.setFullyPopulate(fullyPopulate)
.setPublicOnly(publicOnly));
@@ -169,7 +169,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, String assetId, Ruleset.Lang language, boolean fullyPopulate) {
+ public AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, String assetId, List<Ruleset.Lang> languages, boolean fullyPopulate) {
Asset asset = assetStorageService.find(assetId, false);
if (asset == null)
return new AssetRuleset[0];
@@ -186,7 +186,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
.setRealm(asset.getRealm())
.setAssetIds(assetId)
.setPublicOnly(publicOnly)
- .setLanguage(language)
+ .setLanguages(languages.toArray(new Ruleset.Lang[0]))
.setFullyPopulate(fullyPopulate));
// Try and retrieve transient status and error data
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 14798087e..bf71a6cdd 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
@@ -200,10 +200,18 @@ public class RulesetStorageService implements ContainerService {
if (query.enabledOnly) {
sb.append(" AND R.ENABLED");
}
- if (query.language != null) {
- sb.append(" AND R.RULES_LANG = ?");
+ if (query.languages != null && query.languages.length > 0) {
+ sb.append(" AND R.RULES_LANG IN (?");
final int pos = binders.size() + 1;
- binders.add(st -> st.setString(pos, query.language.toString()));
+ binders.add(st -> st.setString(pos, query.languages[0].toString()));
+
+ for (int i = 1; i < query.languages.length; i++) {
+ sb.append(",?");
+ final int pos2 = binders.size() + 1;
+ final int index = i;
+ binders.add(st -> st.setString(pos2, query.languages[index].toString()));
+ }
+ sb.append(")");
}
if (query.ids != null && query.ids.length > 0) {
sb.append(" AND R.ID IN (?");
diff --git a/model/src/main/java/org/openremote/model/query/RulesetQuery.java b/model/src/main/java/org/openremote/model/query/RulesetQuery.java
index f5092c973..fc1684337 100644
--- a/model/src/main/java/org/openremote/model/query/RulesetQuery.java
+++ b/model/src/main/java/org/openremote/model/query/RulesetQuery.java
@@ -29,7 +29,7 @@ public class RulesetQuery {
public long[] ids;
public MetaPredicate[] meta;
public int limit;
- public Ruleset.Lang language;
+ public Ruleset.Lang[] languages;
public boolean fullyPopulate;
public boolean publicOnly;
public boolean enabledOnly;
@@ -54,8 +54,8 @@ public class RulesetQuery {
return this;
}
- public RulesetQuery setLanguage(Ruleset.Lang language) {
- this.language = language;
+ public RulesetQuery setLanguages(Ruleset.Lang...languages) {
+ this.languages = languages;
return this;
}
@@ -90,7 +90,7 @@ public class RulesetQuery {
"ids=" + Arrays.toString(ids) +
", meta=" + Arrays.toString(meta) +
", limit=" + limit +
- ", language=" + language +
+ ", languages=" + Arrays.toString(languages) +
", fullyPopulate=" + fullyPopulate +
", publicOnly=" + publicOnly +
", realm='" + realm + '\'' +
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 6c2f5d3ef..d78890084 100644
--- a/model/src/main/java/org/openremote/model/rules/RulesResource.java
+++ b/model/src/main/java/org/openremote/model/rules/RulesResource.java
@@ -29,6 +29,8 @@ import javax.annotation.security.RolesAllowed;
import javax.validation.Valid;
import javax.ws.rs.*;
+import java.util.List;
+
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
@Path("rules")
@@ -74,7 +76,7 @@ public interface RulesResource {
@SuccessStatusCode(200)
@RolesAllowed({Constants.READ_RULES_ROLE})
@SuppressWarnings("unusable-by-js")
- GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, @QueryParam("language")Ruleset.Lang language, @QueryParam("fullyPopulate") boolean fullyPopulate);
+ GlobalRuleset[] getGlobalRulesets(@BeanParam RequestParams requestParams, @QueryParam("language") List<Ruleset.Lang> languages, @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
@@ -86,7 +88,7 @@ public interface RulesResource {
@Produces(APPLICATION_JSON)
@SuccessStatusCode(200)
@SuppressWarnings("unusable-by-js")
- TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @QueryParam("language")Ruleset.Lang language, @QueryParam("fullyPopulate") boolean fullyPopulate);
+ TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, @PathParam("realm") String realm, @QueryParam("language") List<Ruleset.Lang> languages, @QueryParam("fullyPopulate") boolean fullyPopulate);
/**
* Retrieve rules of an asset. The superuser can retrieve rules of all realms and assets, a 403 status is returned
@@ -98,7 +100,7 @@ public interface RulesResource {
@Produces(APPLICATION_JSON)
@SuccessStatusCode(200)
@SuppressWarnings("unusable-by-js")
- AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId, @QueryParam("language")Ruleset.Lang language, @QueryParam("fullyPopulate") boolean fullyPopulate);
+ AssetRuleset[] getAssetRulesets(@BeanParam RequestParams requestParams, @PathParam("assetId") String assetId, @QueryParam("language") List<Ruleset.Lang> languages, @QueryParam("fullyPopulate") boolean fullyPopulate);
/* ################################################################################################# */