Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix for getting asset updates in Rules when starting the system

Michael Rademakerba562be0f0c8
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesService.java b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
index 66756ef5e..861bdcff0 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -127,8 +127,10 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
// The objects are already in memory inside the rule engines but keeping them
// here means we can quickly insert facts into newly started engines
protected Set<AssetState<?>> assetStates = new HashSet<>();
+ protected Set<AssetState<?>> preInitassetStates = new HashSet<>();
protected String configEventExpires;
protected boolean initDone;
+ protected boolean startDone;
@Override
public int getPriority() {
@@ -299,6 +301,11 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
}
tenantEngines.values().forEach(RulesEngine::start);
assetEngines.values().forEach(RulesEngine::start);
+
+ preInitassetStates.forEach(this::doProcessAssetUpdate);
+ preInitassetStates.clear();
+
+ startDone = true;
}
@Override
@@ -339,22 +346,30 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
Asset<?> asset,
Attribute<?> attribute,
Source source) throws AssetProcessingException {
+ if (!startDone) {
+ preInitassetStates.add(new AssetState<>(asset, attribute, source));
+ } else {
+ doProcessAssetUpdate(new AssetState<>(asset, attribute, source));
+ }
+
+ return false;
+ }
+
+ protected void doProcessAssetUpdate(AssetState<?> assetState) {
// We might process two facts for a single attribute update, if that is what the user wants
// First as asset state
- if (attributeIsRuleState(attribute)) {
- updateAssetState(new AssetState<>(asset, attribute, source));
+ if (assetState.getMetaValue(MetaItemType.RULE_STATE).orElse(assetState.hasMeta(MetaItemType.AGENT_LINK))) {
+ updateAssetState(assetState);
}
// Then as asset event (if there wasn't an error), this will also fire the rules engines
- if (attribute.getMetaValue(MetaItemType.RULE_EVENT).orElse(false)) {
+ if (assetState.getMetaValue(MetaItemType.RULE_EVENT).orElse(false)) {
insertAssetEvent(
- new AssetState<>(asset, attribute, source),
- attribute.getMetaValue(MetaItemType.RULE_EVENT_EXPIRES).orElse(configEventExpires)
+ assetState,
+ assetState.getMetaValue(MetaItemType.RULE_EVENT_EXPIRES).orElse(configEventExpires)
);
}
-
- return false;
}
public boolean isRulesetKnown(Ruleset ruleset) {
diff --git a/model/src/main/java/org/openremote/model/rules/AssetState.java b/model/src/main/java/org/openremote/model/rules/AssetState.java
index ad8ee1404..bbeed7f7b 100644
--- a/model/src/main/java/org/openremote/model/rules/AssetState.java
+++ b/model/src/main/java/org/openremote/model/rules/AssetState.java
@@ -26,10 +26,7 @@ import org.openremote.model.asset.Asset;
import org.openremote.model.attribute.Attribute;
import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.MetaMap;
-import org.openremote.model.value.MetaHolder;
-import org.openremote.model.value.NameValueHolder;
-import org.openremote.model.value.ValueDescriptor;
-import org.openremote.model.value.Values;
+import org.openremote.model.value.*;
import java.util.Date;
import java.util.Objects;
@@ -184,6 +181,14 @@ public class AssetState<T> implements Comparable<AssetState<?>>, NameValueHolder
return meta;
}
+ public <U> Optional<U> getMetaValue(MetaItemDescriptor<U> metaItemDescriptor) {
+ return getMeta().getValue(metaItemDescriptor);
+ }
+
+ public boolean hasMeta(MetaItemDescriptor<?> metaItemDescriptor) {
+ return getMeta().has(metaItemDescriptor);
+ }
+
/**
* Compares entity identifier, attribute name, value, and timestamp.
*/