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
Fixes problems with ObjectValue attributes not updating properly and AssetStorage updates are processed in a good way now by the RulesService
Michael Rademaker7b9af3e4ad43
diff --git a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.javaindex f92936591..fcedb0312 100644--- a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java+++ b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java@@ -159,7 +159,7 @@ public class AssetQueryPredicate implements Predicate<AssetState> {public static Predicate<ObjectValue> asPredicate(ObjectValueKeyPredicate predicate) {return objectValue -> {if (objectValue == null) {- return false;+ return predicate.negated;}boolean result = objectValue.hasKey(predicate.key);diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.javaindex c2a72b2c2..5a1ffe141 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java@@ -412,8 +412,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse// Retract facts for attributes that are obsoletegetAddedOrModifiedAttributes(newRuleStateAttributes,- oldRuleStateAttributes,- key -> key.equals(VALUE_TIMESTAMP_FIELD_NAME))+ oldRuleStateAttributes).forEach(obsoleteFactAttribute -> {AssetState update = buildAssetState.apply(loadedAsset, obsoleteFactAttribute);LOG.fine("Asset was persisted (" + persistenceEvent.getCause() + "), retracting: " + update);@@ -422,8 +421,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse// Insert facts for attributes that are newgetAddedOrModifiedAttributes(oldRuleStateAttributes,- newRuleStateAttributes,- key -> key.equals(VALUE_TIMESTAMP_FIELD_NAME))+ newRuleStateAttributes).forEach(newFactAttribute -> {AssetState assetState = buildAssetState.apply(loadedAsset, newFactAttribute);LOG.fine("Asset was persisted (" + persistenceEvent.getCause() + "), updating: " + assetState);diff --git a/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.java b/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.javaindex a1c9c26a8..225d2fb59 100644--- a/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.java@@ -53,4 +53,12 @@ public class ObjectValueKeyPredicate implements ValuePredicate {objectValue.put("key", Values.create(key));return objectValue;}++ @Override+ public String toString() {+ return getClass().getSimpleName() + "{" ++ "key=" + key ++ ", negated=" + negated ++ '}';+ }}