Skip to content

armgit / core

Public Imported from GitHub
0

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

WebsocketClientProtocol minor update

Rich Turner4b80b0aff36b
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientProtocol.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientProtocol.java
index 62528b37e..5603e7de8 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientProtocol.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClientProtocol.java
@@ -368,8 +368,8 @@ public class WebsocketClientProtocol extends AbstractProtocol {
LOG.warning("Readonly attribute doesn't have any message filters and will therefore display nothing: " + attribute.getReferenceOrThrow());
}
- if (hasFilters && (filters == null || matchPredicate == null)) {
- LOG.warning("Invalid or missing '" + META_ATTRIBUTE_MESSAGE_MATCH_FILTERS.getUrn() + "' and/or '" + META_ATTRIBUTE_MESSAGE_MATCH_PREDICATE.getUrn() + "': " + attribute.getReferenceOrThrow());
+ if (hasFilters && matchPredicate == null) {
+ LOG.warning("Invalid or missing '" + META_ATTRIBUTE_MESSAGE_MATCH_PREDICATE.getUrn() + "': " + attribute.getReferenceOrThrow());
return;
}
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 3e3ad5779..41a76cd15 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -777,6 +777,10 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
@Override
public Value applyValueFilters(Value value, ValueFilter... filters) {
+ if (filters == null) {
+ return value;
+ }
+
LOG.fine("Applying value filters to value...");
for (ValueFilter filter : filters) {
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java
index 3c354495c..aece4193a 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/ManagerDemoSetup.java
@@ -438,13 +438,13 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
.setMeta(
new MetaItem(RANGE_MIN, Values.create(0)),
new MetaItem(RANGE_MAX, Values.create(100)),
- new MetaItem(LABEL, Values.create("Living room ceiling")),
+ new MetaItem(LABEL, Values.create("Ceiling lights (range)")),
new MetaItem(ACCESS_RESTRICTED_READ, Values.create(true)),
new MetaItem(ACCESS_RESTRICTED_WRITE, Values.create(true))
),
new AssetAttribute("lightsStand", AttributeValueType.BOOLEAN, Values.create(true))
.setMeta(
- new MetaItem(LABEL, Values.create("Living room stand")),
+ new MetaItem(LABEL, Values.create("Floor stand lights (on/off)")),
new MetaItem(ACCESS_RESTRICTED_READ, Values.create(true)),
new MetaItem(ACCESS_RESTRICTED_WRITE, Values.create(true))
)