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
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.javaindex 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, Asseprotected 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.javaindex 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 {