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
Added Path to AssetFilter in order to check if AssetId is in Path of AssetEvent
Michael Rademakerf90c96b996f3
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex 6d7095c83..7aaffde22 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -513,7 +513,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerattribute.getName(),attribute.getValue().orElse(null),timerService.getCurrentTimeMillis()- ).setParentId(asset.getParentId()).setRealm(asset.getRealm())+ ).setParentId(asset.getParentId()).setRealm(asset.getRealm()).setPath(asset.getPath()));}diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 510745034..8a93fe7ac 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -387,7 +387,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicAsset<?> asset = find(new AssetQuery().ids(assetId)- .select(new Select().excludePath(true).excludeParentInfo(true))+ .select(new Select().excludePath(false).excludeParentInfo(true)).access(access));if (asset != null) {diff --git a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.javaindex 32b86d90d..8bc762866 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/MqttBrokerService.java@@ -200,6 +200,7 @@ public class MqttBrokerService implements ContainerService {String realm = connection.getRealm();List<String> assetIds = new ArrayList<>();List<String> parentIds = new ArrayList<>();+ List<String> paths = new ArrayList<>();List<String> attributeNames = new ArrayList<>();String assetId = SINGLE_LEVEL_WILDCARD.equals(topicTokens.get(1)) || MULTI_LEVEL_WILDCARD.equals(topicTokens.get(1)) ? null : topicTokens.get(1);@@ -225,8 +226,7 @@ public class MqttBrokerService implements ContainerService {if (isAssetTopic) {if (multiLevelIndex == 2) {//asset/assetId/#- // TODO: Implement this once asset filter supports it- parentIds.add(assetId);+ paths.add(assetId);} else if (singleLevelIndex == 2) {//asset/assetId/+parentIds.add(assetId);@@ -237,8 +237,7 @@ public class MqttBrokerService implements ContainerService {if (assetId != null) {if (multiLevelIndex == 2) {//attribute/assetId/#- // TODO: Implement this once asset filter supports it- parentIds.add(assetId);+ paths.add(assetId);} else if (singleLevelIndex == 2) {//attribute/assetId/+parentIds.add(assetId);@@ -258,8 +257,7 @@ public class MqttBrokerService implements ContainerService {if (attributeName != null) {attributeNames.add(attributeName);if (multiLevelIndex == 2) {- //attribute/#/attributeName- // No asset filtering required+ return null; //no topic allowed after multilevel wildcard} else if (singleLevelIndex == 2) {//attribute/+/attributeNameparentIds.add(null);@@ -279,8 +277,7 @@ public class MqttBrokerService implements ContainerService {if (attributeName != null) {attributeNames.add(attributeName);if (multiLevelIndex == 2) {- //attribute/#/attributeName- // No asset filtering required+ return null; //no topic allowed after multilevel wildcard} else if (singleLevelIndex == 2) {//attribute/assetId/+/attributeNameparentIds.add(assetId);@@ -301,6 +298,9 @@ public class MqttBrokerService implements ContainerService {if (!parentIds.isEmpty()) {assetFilter.setParentIds(parentIds.toArray(new String[0]));}+ if(!paths.isEmpty()) {+ assetFilter.setPath(paths.toArray(new String[0]));+ }if (!attributeNames.isEmpty()) {assetFilter.setAttributeNames(attributeNames.toArray(new String[0]));}@@ -316,7 +316,6 @@ public class MqttBrokerService implements ContainerService {}});}-protected Consumer<SharedEvent> getEventConsumer(MqttConnection connection, String topic, boolean isValueSubscription) {return ev -> {List<String> topicTokens = Arrays.asList(topic.split("/"));diff --git a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.javaindex 286eb7368..044e87d5a 100644--- a/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java+++ b/manager/src/main/java/org/openremote/manager/mqtt/ORInterceptHandler.java@@ -124,7 +124,7 @@ public class ORInterceptHandler extends AbstractInterceptHandler {@Overridepublic void onConnectionLost(InterceptConnectionLostMessage msg) {- MqttConnection connection = sessionIdConnectionMap.get(msg.getClientID());+ MqttConnection connection = sessionIdConnectionMap.remove(msg.getClientID());if (connection != null) {Map<String, Object> headers = prepareHeaders(connection);diff --git a/model/src/main/java/org/openremote/model/asset/AssetEvent.java b/model/src/main/java/org/openremote/model/asset/AssetEvent.javaindex e3f282a83..41d8f9aca 100644--- a/model/src/main/java/org/openremote/model/asset/AssetEvent.java+++ b/model/src/main/java/org/openremote/model/asset/AssetEvent.java@@ -67,6 +67,11 @@ public class AssetEvent extends SharedEvent implements AssetInfo {return asset.parentId;}+ @Override+ public String[] getPath() {+ return asset.getPath();+ }+@Overridepublic String[] getAttributeNames() {return updatedProperties;diff --git a/model/src/main/java/org/openremote/model/asset/AssetFilter.java b/model/src/main/java/org/openremote/model/asset/AssetFilter.javaindex 603a76a2b..9adbd0405 100644--- a/model/src/main/java/org/openremote/model/asset/AssetFilter.java+++ b/model/src/main/java/org/openremote/model/asset/AssetFilter.java@@ -34,6 +34,7 @@ public class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<protected String[] assetIds;protected String realm;protected String[] parentIds;+ protected String[] path;protected String[] attributeNames;public AssetFilter() {@@ -70,6 +71,11 @@ public class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<return this;}+ public AssetFilter<T> setPath(String[] path) {+ this.path = path;+ return this;+ }+public String[] getAttributeNames() {return attributeNames;}@@ -99,6 +105,13 @@ public class AssetFilter<T extends SharedEvent & AssetInfo> extends EventFilter<}}+ if(path != null && path.length > 0) {+ List<String> pathList = Arrays.asList(event.getPath());+ if (Arrays.stream(path).noneMatch(pathList::contains)) {+ return false;+ }+ }+if (!TextUtil.isNullOrEmpty(realm)) {if (!realm.equals(event.getRealm())) {return false;diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeEvent.java b/model/src/main/java/org/openremote/model/attribute/AttributeEvent.javaindex d3f4bf43a..20b05de35 100644--- a/model/src/main/java/org/openremote/model/attribute/AttributeEvent.java+++ b/model/src/main/java/org/openremote/model/attribute/AttributeEvent.java@@ -72,6 +72,7 @@ public class AttributeEvent extends SharedEvent implements AssetInfo {protected AttributeState attributeState;protected String realm;protected String parentId;+ protected String[] path;public <T> AttributeEvent(String assetId, AttributeDescriptor<T> attributeDescriptor, T value) {this(assetId, attributeDescriptor.getName(), value);@@ -143,6 +144,16 @@ public class AttributeEvent extends SharedEvent implements AssetInfo {return this;}+ @Override+ public String[] getPath() {+ return path;+ }++ public AttributeEvent setPath(String[] path) {+ this.path = path;+ return this;+ }+@Overridepublic String[] getAttributeNames() {return new String[]{getAttributeRef().getName()};diff --git a/model/src/main/java/org/openremote/model/event/shared/AssetInfo.java b/model/src/main/java/org/openremote/model/event/shared/AssetInfo.javaindex dccf5bf42..1d623c32f 100644--- a/model/src/main/java/org/openremote/model/event/shared/AssetInfo.java+++ b/model/src/main/java/org/openremote/model/event/shared/AssetInfo.java@@ -27,5 +27,7 @@ public interface AssetInfo {String getParentId();+ String[] getPath();+String[] getAttributeNames();}