Skip to content

armgit / core

Public Imported from GitHub
0

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

Add ability to query assets to ProtocolAssetService.java

Rich Turner70f451b169e5
diff --git a/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.java b/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.java
index 0bac36d37..da04ef4b6 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/ProtocolAssetService.java
@@ -23,9 +23,11 @@ import org.openremote.container.ContainerService;
import org.openremote.model.asset.Asset;
import org.openremote.model.asset.AssetAttribute;
import org.openremote.model.attribute.AttributeEvent;
+import org.openremote.model.query.AssetQuery;
import org.openremote.model.value.Value;
import org.openremote.model.value.ValueFilter;
+import java.util.List;
import java.util.function.Predicate;
/**
@@ -137,6 +139,12 @@ public interface ProtocolAssetService extends ContainerService {
*/
Asset findAsset(String assetId);
+ /**
+ * Get assets by an {@link org.openremote.model.query.AssetQuery}; can only access {@link Asset}s that are
+ * descendants of the specified {@link Asset}
+ */
+ List<Asset> findAssets(String assetId, AssetQuery assetQuery);
+
/**
* Protocols can send arbitrary attribute change events for regular processing.
*/
diff --git a/manager/src/main/java/org/openremote/manager/agent/AgentService.java b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
index 502d7d96d..fe1560cdb 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -52,6 +52,7 @@ import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.MetaItemType;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.AssetQuery;
+import org.openremote.model.query.filter.PathPredicate;
import org.openremote.model.query.filter.RefPredicate;
import org.openremote.model.security.ClientRole;
import org.openremote.model.util.Pair;
@@ -306,6 +307,26 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
return assetStorageService.find(assetId);
}
+ @Override
+ public List<Asset> findAssets(String assetId, AssetQuery assetQuery) {
+ if (TextUtil.isNullOrEmpty(assetId) || assetQuery == null) {
+ return Collections.emptyList();
+ }
+
+ // Ensure agent ID is injected into each path predicate
+ if (assetQuery.paths != null) {
+ for (PathPredicate pathPredicate : assetQuery.paths) {
+ int len = pathPredicate.path.length;
+ pathPredicate.path = Arrays.copyOf(pathPredicate.path, len+1);
+ pathPredicate.path[len] = assetId;
+ }
+ } else {
+ assetQuery.paths(new PathPredicate(assetId));
+ }
+
+ return assetStorageService.findAll(assetQuery);
+ }
+
@Override
public void sendAttributeEvent(AttributeEvent attributeEvent) {
assetProcessingService.sendAttributeEvent(attributeEvent);