Skip to content

armgit / core

Public Imported from GitHub
0

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

AssetQuery related updates

Rich Turner8059d32f3439
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 825ed1e45..9f27314b8 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -753,7 +753,6 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
protected Stream<Pair<Asset, Stream<AssetAttribute>>> findRuleStateAttributes() {
List<Asset> assets = assetStorageService.findAll(
new AssetQuery()
- .select(selectExcludePathAndAttributes())
.attributeMeta(
new AttributeMetaPredicate(
MetaItemType.RULE_STATE,
diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java
index 9359c21c3..504f97e8d 100644
--- a/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/AssetsFacade.java
@@ -82,6 +82,9 @@ public class AssetsFacade<T extends Ruleset> extends Assets {
AssetQuery.Select oldValue = assetQuery.select;
+ if (assetQuery.select == null)
+ assetQuery.select = AssetQuery.Select.selectExcludePathAndAttributes();
+
assetQuery.select = AssetQuery.Select.selectExcludeAll();
try {