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
Minor update for AssetIdFilter
Rich Turner59c1f4b453ea
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.javaindex 9c18feffe..76455172c 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetViewActivity.java@@ -45,7 +45,6 @@ import org.openremote.model.datapoint.AssetDatapointResource;import org.openremote.model.datapoint.Datapoint;import org.openremote.model.datapoint.DatapointInterval;import org.openremote.model.datapoint.NumberDatapoint;-import org.openremote.model.event.shared.SharedEventWithAssetId;import org.openremote.model.event.shared.TenantFilter;import org.openremote.model.interop.Consumer;import org.openremote.model.map.MapResource;@@ -187,7 +186,7 @@ public class AssetViewActivityprotected void subscribeLiveUpdates(boolean subscribe) {if (subscribe) {environment.getEventService().subscribe(- SharedEventWithAssetId.class,+ AttributeEvent.class,new AssetEvent.AssetIdFilter(asset.getId()));} else {diff --git a/client/src/main/java/org/openremote/app/client/map/MapActivity.java b/client/src/main/java/org/openremote/app/client/map/MapActivity.javaindex c90bae5de..b42a3fbcd 100644--- a/client/src/main/java/org/openremote/app/client/map/MapActivity.java+++ b/client/src/main/java/org/openremote/app/client/map/MapActivity.java@@ -40,7 +40,6 @@ import org.openremote.model.attribute.AttributeValueDescriptor;import org.openremote.model.attribute.AttributeValueType;import org.openremote.model.event.bus.EventBus;import org.openremote.model.event.bus.EventRegistration;-import org.openremote.model.event.shared.SharedEventWithAssetId;import org.openremote.model.geo.GeoJSON;import org.openremote.model.map.MapResource;import org.openremote.model.value.Values;@@ -181,7 +180,7 @@ public class MapActivity extends AssetBrowsingActivity<MapPlace> implements MapVif (asset.hasGeoFeature() || dashboardAttributes.size() > 0) {showAssetInfoItems();environment.getEventService().subscribe(- SharedEventWithAssetId.class,+ AttributeEvent.class,new AssetEvent.AssetIdFilter(asset.getId()));}diff --git a/model/src/main/java/org/openremote/model/asset/AssetEvent.java b/model/src/main/java/org/openremote/model/asset/AssetEvent.javaindex 8ce3f24a6..8e80d509f 100644--- a/model/src/main/java/org/openremote/model/asset/AssetEvent.java+++ b/model/src/main/java/org/openremote/model/asset/AssetEvent.java@@ -32,7 +32,7 @@ import java.util.Arrays;*/public class AssetEvent extends SharedEventWithAssetId {- public static class AssetIdFilter extends EventFilter<SharedEventWithAssetId> {+ public static class AssetIdFilter<T extends SharedEventWithAssetId> extends EventFilter<T> {public static final String FILTER_TYPE = "asset-id";