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
Log warning about Asset not found instead of throwing exception with rules engine id to find out which RulesEngine is causing the warning
Michael Rademakerdca9f5dec6e3
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 3a55e73be..ce7a1caa6 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@@ -22,9 +22,9 @@ package org.openremote.manager.rules.facade;import org.openremote.manager.asset.AssetStorageService;import org.openremote.manager.rules.RulesEngineId;import org.openremote.model.asset.Asset;-import org.openremote.model.query.BaseAssetQuery;import org.openremote.model.attribute.AttributeEvent;import org.openremote.model.attribute.AttributeExecuteStatus;+import org.openremote.model.query.BaseAssetQuery;import org.openremote.model.query.filter.PathPredicate;import org.openremote.model.query.filter.TenantPredicate;import org.openremote.model.rules.*;@@ -33,6 +33,7 @@ import org.openremote.model.value.Values;import java.util.Collections;import java.util.function.Consumer;+import java.util.logging.Logger;import java.util.stream.Stream;/**@@ -40,6 +41,9 @@ import java.util.stream.Stream;*/public class AssetsFacade<T extends Ruleset> extends Assets {+ private static final Logger LOG = Logger.getLogger(AssetsFacade.class.getName());++public class AssetsRestrictedQueryFacade extends Assets.RestrictedQuery {public AssetsRestrictedQueryFacade() {@@ -130,14 +134,12 @@ public class AssetsFacade<T extends Ruleset> extends Assets {if (events == null)return this;for (AttributeEvent event : events) {-// Check if the asset ID of the event can be found with the default query of this facadeBaseAssetQuery<RestrictedQuery> checkQuery = query();checkQuery.ids = Collections.singletonList(event.getEntityId()); // Set directly on field, as modifying query restrictions is not allowedif (assetStorageService.find(checkQuery) == null) {- throw new IllegalArgumentException(- "Access to asset not allowed for this rule engine scope: " + event- );+ LOG.warning("Access to asset not allowed for this rule engine scope " + rulesEngineId + " for event: " + event);+ continue;}eventConsumer.accept(event);}