Skip to content

armgit / core

Public Imported from GitHub
0

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

Various rule updates and calendar event refactor (now also supported by rulesets):

Rich Turner598bc78c93c8
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java
index 12319bf0d..db7d1ce53 100644
--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java
+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java
@@ -21,7 +21,6 @@ package org.openremote.app.client.assets.asset;
import com.google.gwt.user.client.ui.IsWidget;
import org.openremote.app.client.Environment;
-import org.openremote.app.client.app.AppControllerImpl;
import org.openremote.app.client.assets.*;
import org.openremote.app.client.assets.attributes.*;
import org.openremote.app.client.assets.browser.AssetBrowser;
@@ -48,7 +47,7 @@ import org.openremote.model.http.ConstraintViolation;
import org.openremote.model.interop.Consumer;
import org.openremote.model.map.MapResource;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.query.filter.AttributeMetaPredicate;
+import org.openremote.model.query.filter.MetaPredicate;
import org.openremote.model.query.filter.BooleanPredicate;
import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.util.EnumUtil;
@@ -376,7 +375,7 @@ public class AssetEditActivity
}
// Agents must have protocol configurations
- query.attributeMeta(new AttributeMetaPredicate(MetaItemType.PROTOCOL_CONFIGURATION, new BooleanPredicate(true)));
+ query.attributeMeta(new MetaPredicate(MetaItemType.PROTOCOL_CONFIGURATION, new BooleanPredicate(true)));
// Only show protocol configurations
attributeFilter = ProtocolConfiguration::isProtocolConfiguration;
diff --git a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.java b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.java
index 8ad49ab43..cb31c25ae 100644
--- a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.java
+++ b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesEditorActivity.java
@@ -84,7 +84,7 @@ public class AssetRulesEditorActivity
@Override
protected AssetRuleset newRuleset() {
- return new AssetRuleset(null, null, null, assetId, false, false);
+ return new AssetRuleset(assetId, null, null, null);
}
@Override
diff --git a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.java b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.java
index 1db71dbfb..7386fcc2e 100644
--- a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.java
+++ b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesEditorActivity.java
@@ -84,7 +84,7 @@ public class TenantRulesEditorActivity
@Override
protected TenantRuleset newRuleset() {
- return new TenantRuleset(null, null, null, realm, false, false);
+ return new TenantRuleset(realm, null, null, null);
}
@Override
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 8550334b8..c7fc156a3 100644
--- a/manager/src/main/java/org/openremote/manager/agent/AgentService.java
+++ b/manager/src/main/java/org/openremote/manager/agent/AgentService.java
@@ -50,7 +50,7 @@ import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.MetaItemType;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.query.filter.AttributeRefPredicate;
+import org.openremote.model.query.filter.RefPredicate;
import org.openremote.model.security.ClientRole;
import org.openremote.model.util.Pair;
import org.openremote.model.util.TextUtil;
@@ -494,7 +494,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
List<Asset> assets = assetStorageService.findAll(
new AssetQuery()
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
MetaItemType.AGENT_LINK,
protocolAttributeRef.getEntityId(),
protocolAttributeRef.getAttributeName()
@@ -523,7 +523,7 @@ public class AgentService extends RouteBuilder implements ContainerService, Asse
List<Asset> assets = assetStorageService.findAll(
new AssetQuery()
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
MetaItemType.AGENT_LINK,
protocolAttributeRef.getEntityId(),
protocolAttributeRef.getAttributeName()
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingException.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingException.java
index 72d8eac36..b40305f5e 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingException.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingException.java
@@ -121,22 +121,21 @@ public class AssetProcessingException extends RuntimeException {
}
final protected Reason reason;
- final protected String message;
public AssetProcessingException(Reason reason) {
this(reason, null);
}
public AssetProcessingException(Reason reason, String message) {
+ this(reason, message, null);
+ }
+
+ public AssetProcessingException(Reason reason, String message, Throwable cause) {
+ super(reason + (message != null ? " (" + message + ")": ""), cause);
this.reason = reason;
- this.message = message;
}
public Reason getReason() {
return reason;
}
-
- public String getReasonPhrase() {
- return getReason() + (message != null ? " (" + message + ")": "");
- }
}
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
index db68269a9..ba8e680ce 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java
@@ -463,7 +463,8 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
} catch (Throwable t) {
throw new AssetProcessingException(
PROCESSOR_FAILURE,
- "processor '" + processor + "' threw exception: " + t.toString()
+ "processor '" + processor + "' threw an exception",
+ t
);
}
if (complete) {
@@ -504,7 +505,7 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSer
// TODO Better exception handling - dead letter queue?
if (exception instanceof AssetProcessingException) {
AssetProcessingException processingException = (AssetProcessingException) exception;
- error.append(" - ").append(processingException.getReasonPhrase());
+ error.append(" - ").append(processingException.getMessage());
error.append(": ").append(event.toString());
logger.warning(error.toString());
} else {
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
index e2dc6b424..31533e7a0 100644
--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java
@@ -19,13 +19,6 @@
*/
package org.openremote.manager.asset;
-import net.fortuna.ical4j.filter.PeriodRule;
-import net.fortuna.ical4j.model.DateTime;
-import net.fortuna.ical4j.model.Dur;
-import net.fortuna.ical4j.model.Period;
-import net.fortuna.ical4j.model.Recur;
-import net.fortuna.ical4j.model.component.VEvent;
-import net.fortuna.ical4j.model.property.RRule;
import org.apache.camel.builder.RouteBuilder;
import org.hibernate.Session;
import org.hibernate.jdbc.AbstractReturningWork;
@@ -49,7 +42,6 @@ import org.openremote.model.attribute.AttributeEvent;
import org.openremote.model.attribute.MetaItemDescriptor;
import org.openremote.model.attribute.MetaItemType;
import org.openremote.model.calendar.CalendarEvent;
-import org.openremote.model.calendar.RecurrenceRule;
import org.openremote.model.event.TriggeredEventSubscription;
import org.openremote.model.event.shared.TenantFilter;
import org.openremote.model.query.AssetQuery;
@@ -73,6 +65,7 @@ import java.util.Date;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
+import java.util.function.Predicate;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -83,6 +76,7 @@ import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_
import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;
import static org.openremote.manager.event.ClientEventService.CLIENT_EVENT_TOPIC;
import static org.openremote.manager.event.ClientEventService.getSessionKey;
+import static org.openremote.manager.rules.AssetQueryPredicate.asPredicate;
import static org.openremote.model.asset.AssetAttribute.*;
import static org.openremote.model.attribute.MetaItemType.ACCESS_RESTRICTED_READ;
import static org.openremote.model.query.AssetQuery.*;
@@ -131,41 +125,76 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
protected ManagerIdentityService identityService;
protected ClientEventService clientEventService;
- protected static boolean calendarEventPredicateMatches(CalendarEventActivePredicate eventActivePredicate, Asset asset) {
- return CalendarEventConfiguration.getCalendarEvent(asset)
- .map(calendarEvent -> calendarEventActiveOn(calendarEvent,
- new Date(1000L * eventActivePredicate.timestampSeconds)))
- .orElse(true);
- }
+ /**
+ * Will evaluate each {@link CalendarEventPredicate} and apply it depending on the {@link LogicGroup} type
+ * that each appears in. It tests the recurrence rule as simple start/end is checked in the DB query.
+ */
+ protected static boolean calendarEventPredicateMatches(AssetQuery query, Asset asset) {
- protected static boolean calendarEventActiveOn(CalendarEvent calendarEvent, Date when) {
- if (calendarEvent.getRecurrence() == null) {
- return (!when.before(calendarEvent.getStart()) && !when.after(calendarEvent.getEnd()));
+ if (query.attributes == null) {
+ return true;
}
- RecurrenceRule recurrenceRule = calendarEvent.getRecurrence();
- Recur recurrence;
+ return calendarEventPredicateMatches(query.attributes, asset);
+ }
- if (recurrenceRule.getCount() != null) {
- recurrence = new Recur(recurrenceRule.getFrequency().name(), recurrenceRule.getCount());
- } else if (recurrenceRule.getUntil() != null) {
- recurrence = new Recur(recurrenceRule.getFrequency().name(),
- new net.fortuna.ical4j.model.Date(recurrenceRule.getUntil()));
- } else {
- recurrence = new Recur(recurrenceRule.getFrequency().name(), null);
+ private static boolean calendarEventPredicateMatches(LogicGroup<AttributePredicate> group, Asset asset) {
+ boolean isOr = group.operator == LogicGroup.Operator.OR;
+ boolean matches = true;
+
+ if (group.items != null) {
+ for (AttributePredicate attributePredicate : group.items) {
+ if (attributePredicate.value instanceof CalendarEventPredicate) {
+ Predicate<String> namePredicate = StringPredicate.asPredicate(attributePredicate.name);
+ Predicate<CalendarEvent> valuePredicate = asPredicate((CalendarEventPredicate)attributePredicate.value);
+ List<AssetAttribute> matchedAttributes = asset.getAttributesStream()
+ .filter(attr -> namePredicate.test(attr.name)).collect(Collectors.toList());
+
+ matches = true;
+
+ if (!matchedAttributes.isEmpty()) {
+ for (AssetAttribute attribute : matchedAttributes) {
+ matches = valuePredicate.test(attribute.getValue().flatMap(CalendarEvent::fromValue).orElse(null));
+ if (isOr && matches) {
+ break;
+ }
+ if (!isOr && !matches) {
+ break;
+ }
+ }
+ }
+
+ if (isOr && matches) {
+ break;
+ }
+ if (!isOr && !matches) {
+ break;
+ }
+ }
+ }
}
- if (recurrenceRule.getInterval() != null) {
- recurrence.setInterval(recurrenceRule.getInterval());
+ if (isOr && matches) {
+ return true;
+ }
+ if (!isOr && !matches) {
+ return false;
+ }
+
+ if (group.groups != null) {
+ for (LogicGroup<AttributePredicate> childGroup : group.groups) {
+ matches = calendarEventPredicateMatches(childGroup, asset);
+
+ if (isOr && matches) {
+ break;
+ }
+ if (!isOr && !matches) {
+ break;
+ }
+ }
}
- RRule rRule = new RRule(recurrence);
- VEvent vEvent = new VEvent(new DateTime(calendarEvent.getStart()),
- new DateTime(calendarEvent.getEnd()), "");
- vEvent.getProperties().add(rRule);
- Period period = new Period(new DateTime(when), new Dur(0, 0, 1, 0));
- PeriodRule periodRule = new PeriodRule(period);
- return periodRule.evaluate(vEvent);
+ return matches;
}
@Override
@@ -325,7 +354,6 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
throw new IllegalArgumentException("Query returned more than one asset");
}
return result.get(0);
-
}
public List<Asset> findAll(AssetQuery query) {
@@ -687,7 +715,14 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
if (query.orderBy == null && query.ids == null)
query.orderBy = new OrderBy(OrderBy.Property.CREATED_ON);
- PreparedAssetQuery querySql = buildQuery(query);
+ Pair<PreparedAssetQuery, Boolean> queryAndContainsCalendarPredicate = buildQuery(query);
+ PreparedAssetQuery querySql = queryAndContainsCalendarPredicate.key;
+ boolean containsCalendarPredicate = queryAndContainsCalendarPredicate.value;
+
+ if (containsCalendarPredicate && (query.select != null && (query.select.excludeAttributes || query.select.excludeAttributeValue || query.select.excludeAttributeType))) {
+ LOG.info("Asset query contains a calendar event predicate which requires the attribute values and types to be included in the select (as calendar event predicate is applied post DB query)");
+ throw new IllegalArgumentException("Asset query contains a calendar event predicate which requires the attribute values and types to be included in the select (as calendar event predicate is applied post DB query)");
+ }
return em.unwrap(Session.class).doReturningWork(new AbstractReturningWork<List<Asset>>() {
@Override
@@ -698,10 +733,11 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
try (ResultSet rs = st.executeQuery()) {
List<Asset> result = new ArrayList<>();
- if (query.calendarEventActive != null) {
+ if (containsCalendarPredicate) {
while (rs.next()) {
Asset asset = mapResultTuple(query, rs);
- if (calendarEventPredicateMatches(query.calendarEventActive, asset)) {
+ // Apply calendar event filter here (difficult to translate this into a SQL query)
+ if (calendarEventPredicateMatches(query, asset)) {
result.add(asset);
}
}
@@ -717,30 +753,30 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
});
}
- protected PreparedAssetQuery buildQuery(AssetQuery query) {
+ protected Pair<PreparedAssetQuery, Boolean> buildQuery(AssetQuery query) {
LOG.fine("Building: " + query);
StringBuilder sb = new StringBuilder();
boolean recursive = query.recursive;
List<ParameterBinder> binders = new ArrayList<>();
sb.append(buildSelectString(query, 1, binders));
sb.append(buildFromString(query, 1));
- sb.append(buildWhereClause(query, 1, binders));
+ boolean containsCalendarPredicate = appendWhereClause(sb, query, 1, binders);
if (recursive) {
sb.insert(0, "WITH RECURSIVE top_level_assets AS ((");
sb.append(") UNION (");
sb.append(buildSelectString(query, 2, binders));
sb.append(buildFromString(query, 2));
- sb.append(buildWhereClause(query, 2, binders));
+ containsCalendarPredicate = !containsCalendarPredicate && appendWhereClause(sb, query, 2, binders);
sb.append("))");
sb.append(buildSelectString(query, 3, binders));
sb.append(buildFromString(query, 3));
- sb.append(buildWhereClause(query, 3, binders));
+ containsCalendarPredicate = !containsCalendarPredicate && appendWhereClause(sb, query, 3, binders);
}
sb.append(buildOrderByString(query));
sb.append(buildLimitString(query));
- return new PreparedAssetQuery(sb.toString(), binders);
+ return new Pair<>(new PreparedAssetQuery(sb.toString(), binders), containsCalendarPredicate);
}
protected String buildSelectString(AssetQuery query, int level, List<ParameterBinder> binders) {
@@ -867,8 +903,8 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
if (query.access != PRIVATE) {
// Filter non-private access attributes
- AttributeMetaPredicate accessPredicate =
- new AttributeMetaPredicate()
+ MetaPredicate accessPredicate =
+ new MetaPredicate()
.itemName(query.access == PROTECTED ? ACCESS_RESTRICTED_READ : MetaItemType.ACCESS_PUBLIC_READ)
.itemValue(new BooleanPredicate(true));
sb.append(buildAttributeMetaFilter(binders, accessPredicate));
@@ -964,16 +1000,16 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
return "";
}
- protected String buildWhereClause(AssetQuery query, int level, List<ParameterBinder> binders) {
+ protected boolean appendWhereClause(StringBuilder sb, AssetQuery query, int level, List<ParameterBinder> binders) {
// level = 1 is main query
// level = 2 is union
// level = 3 is CTE
- StringBuilder sb = new StringBuilder();
+ boolean containsCalendarPredicate = false;
boolean recursive = query.recursive;
sb.append(" where true");
if (level == 2) {
- return sb.toString();
+ return containsCalendarPredicate;
}
if (level == 1 && query.ids != null && query.ids.length > 0) {
@@ -1116,7 +1152,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
if (query.attributeMeta != null) {
- for (AttributeMetaPredicate attributeMetaPredicate : query.attributeMeta) {
+ for (MetaPredicate attributeMetaPredicate : query.attributeMeta) {
String attributeMetaFilter = buildAttributeMetaFilter(binders, attributeMetaPredicate);
if (attributeMetaFilter.length() > 0) {
@@ -1136,7 +1172,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
sb.append(" jsonb_each(A.ATTRIBUTES) as AX1");
int offset = sb.length();
sb.append(" where true AND ");
- addAttributePredicateGroupQuery(sb, binders, joinCounter, query.attributes);
+ containsCalendarPredicate = addAttributePredicateGroupQuery(sb, binders, joinCounter, query.attributes);
sb.append(")");
int counter = joinCounter.get();
@@ -1147,11 +1183,12 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
}
}
}
- return sb.toString();
+ return containsCalendarPredicate;
}
- protected void addAttributePredicateGroupQuery(StringBuilder sb, List<ParameterBinder> binders, AtomicInteger joinCounter, LogicGroup<AttributePredicate> attributePredicateGroup) {
+ protected boolean addAttributePredicateGroupQuery(StringBuilder sb, List<ParameterBinder> binders, AtomicInteger joinCounter, LogicGroup<AttributePredicate> attributePredicateGroup) {
+ boolean containsCalendarPredicate = false;
LogicGroup.Operator operator = attributePredicateGroup.operator;
if (operator == null) {
@@ -1175,6 +1212,9 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
for (List<AttributePredicate> group : grouped) {
for (AttributePredicate attributePredicate : group) {
+ if (!containsCalendarPredicate && attributePredicate.value instanceof CalendarEventPredicate) {
+ containsCalendarPredicate = true;
+ }
if (!isFirst) {
sb.append(operator == LogicGroup.Operator.OR ? " or " : " and ");
}
@@ -1191,10 +1231,14 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
if (attributePredicateGroup.groups != null && attributePredicateGroup.groups.size() > 0) {
for (LogicGroup<AttributePredicate> group : attributePredicateGroup.groups) {
sb.append(operator == LogicGroup.Operator.OR ? " or " : " and ");
- addAttributePredicateGroupQuery(sb, binders, joinCounter, group);
+ if (!containsCalendarPredicate && addAttributePredicateGroupQuery(sb, binders, joinCounter, group)) {
+ containsCalendarPredicate = true;
+ }
}
}
sb.append(")");
+
+ return containsCalendarPredicate;
}
protected boolean hasPathConstraint(PathPredicate[] pathPredicates) {
@@ -1205,7 +1249,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
return Arrays.stream(pathPredicates).anyMatch(p -> p.path != null);
}
- protected String buildAttributeMetaFilter(List<ParameterBinder> binders, AttributeMetaPredicate...attributeMetaPredicates) {
+ protected String buildAttributeMetaFilter(List<ParameterBinder> binders, MetaPredicate...attributeMetaPredicates) {
StringBuilder sb = new StringBuilder();
if (attributeMetaPredicates == null || attributeMetaPredicates.length == 0) {
@@ -1215,7 +1259,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
sb.append(" AND (");
boolean isFirst = true;
- for (AttributeMetaPredicate attributeMetaPredicate : attributeMetaPredicates) {
+ for (MetaPredicate attributeMetaPredicate : attributeMetaPredicates) {
if (!isFirst) {
sb.append(" OR (true");
@@ -1326,12 +1370,12 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
Pair<Long, Long> fromAndTo = AssetQueryPredicate.asFromAndTo(timerService.getCurrentTimeMillis(), dateTimePredicate);
final int pos = binders.size() + 1;
- binders.add(st -> st.setObject(pos, new java.sql.Timestamp(fromAndTo.key).toLocalDateTime()));
+ binders.add(st -> st.setTimestamp(pos, new java.sql.Timestamp(fromAndTo.key)));
attributeBuilder.append(buildOperatorFilter(dateTimePredicate.operator, dateTimePredicate.negate));
if (dateTimePredicate.operator == Operator.BETWEEN) {
final int pos2 = binders.size() + 1;
- binders.add(st -> st.setObject(pos2, new java.sql.Timestamp(fromAndTo.value).toLocalDateTime()));
+ binders.add(st -> st.setTimestamp(pos2, new java.sql.Timestamp(fromAndTo.value)));
}
} else if (attributePredicate.value instanceof NumberPredicate) {
NumberPredicate numberPredicate = (NumberPredicate) attributePredicate.value;
@@ -1456,6 +1500,25 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic
attributeBuilder.append("AX").append(joinCounter).append(".VALUE ->> 'value' IS NOT NULL");
} else if (attributePredicate.value instanceof ValueEmptyPredicate) {
attributeBuilder.append("AX").append(joinCounter).append(".VALUE ->> 'value' IS NULL");
+ } else if (attributePredicate.value instanceof CalendarEventPredicate) {
+ final int pos = binders.size() + 1;
+ java.sql.Timestamp when = new java.sql.Timestamp(((CalendarEventPredicate)attributePredicate.value).timestamp.getTime());
+
+ // The recurrence logic is applied post DB query just start key is present and in the past and also
+ // that the end key is numeric and in the future if no recurrence value
+ attributeBuilder.append("(jsonb_typeof(AX")
+ .append(joinCounter)
+ .append(".VALUE #> '{value, start}') = 'number' AND jsonb_typeof(AX")
+ .append(joinCounter)
+ .append(".VALUE #> '{value, end}') = 'number' AND to_timestamp((AX")
+ .append(joinCounter)
+ .append(".VALUE #>> '{value,start}')::float / 1000) <= ? AND (to_timestamp((AX")
+ .append(joinCounter)
+ .append(".VALUE #>> '{value,end}')::float / 1000) > ? OR jsonb_typeof(AX")
+ .append(joinCounter)
+ .append(".VALUE #> '{value,recurrence}') = 'object'))");
+ binders.add((st) -> st.setTimestamp(pos, when));
+ binders.add((st) -> st.setTimestamp(pos+1, when));
} else {
throw new UnsupportedOperationException("Attribute value predicate is not supported: " + attributePredicate.value);
}
diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
index ed9a64807..42783e038 100644
--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointService.java
@@ -21,7 +21,7 @@ import org.openremote.model.datapoint.AssetDatapoint;
import org.openremote.model.datapoint.DatapointInterval;
import org.openremote.model.datapoint.ValueDatapoint;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.query.filter.AttributeMetaPredicate;
+import org.openremote.model.query.filter.MetaPredicate;
import org.openremote.model.value.Value;
import org.openremote.model.value.ValueType;
import org.openremote.model.value.Values;
@@ -33,7 +33,9 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.time.Duration;
import java.time.Instant;
+import java.time.Period;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.List;
@@ -98,12 +100,11 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
@Override
public void start(Container container) throws Exception {
if (maxDatapointAgeDays > 0) {
- long period = 24L * 3600L * 1000L;
-
dataPointsPurgeScheduledFuture = managerExecutorService.scheduleAtFixedRate(
this::purgeDataPoints,
- getFirstRunMillis(timerService.getNow()),
- period);
+
+ getFirstRunMillis(timerService.getNow()),
+ Duration.ofDays(1).toMillis());
}
}
@@ -304,8 +305,8 @@ public class AssetDatapointService implements ContainerService, AssetUpdateProce
List<Asset> assets = assetStorageService.findAll(
new AssetQuery()
.attributeMeta(
- new AttributeMetaPredicate(MetaItemType.DATA_POINTS_MAX_AGE_DAYS),
- new AttributeMetaPredicate(MetaItemType.STORE_DATA_POINTS))
+ new MetaPredicate(MetaItemType.DATA_POINTS_MAX_AGE_DAYS),
+ new MetaPredicate(MetaItemType.STORE_DATA_POINTS))
.select(AssetQuery.Select.selectExcludePathAndParentAndRealm()));
List<AssetAttribute> attributes = assets.stream()
diff --git a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
index fcedb0312..493b3df98 100644
--- a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
+++ b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java
@@ -21,11 +21,17 @@ package org.openremote.manager.rules;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
+import net.fortuna.ical4j.filter.PeriodRule;
+import net.fortuna.ical4j.model.*;
+import net.fortuna.ical4j.model.component.VEvent;
+import net.fortuna.ical4j.model.property.RRule;
import org.geotools.referencing.GeodeticCalculator;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.model.attribute.Meta;
import org.openremote.model.attribute.MetaItem;
+import org.openremote.model.calendar.CalendarEvent;
+import org.openremote.model.calendar.RecurrenceRule;
import org.openremote.model.geo.GeoJSONPoint;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.query.AssetQuery.NumberType;
@@ -39,8 +45,9 @@ import org.openremote.model.value.ObjectValue;
import org.openremote.model.value.Value;
import org.openremote.model.value.Values;
-import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.*;
+import java.util.Date;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@ -376,7 +383,7 @@ public class AssetQueryPredicate implements Predicate<AssetState> {
return true;
}
- for (AttributeMetaPredicate p : predicate.meta) {
+ for (MetaPredicate p : predicate.meta) {
if (!AssetQueryPredicate.asPredicate(currentMillisProducer, p).test(meta)) {
return false;
}
@@ -446,6 +453,10 @@ public class AssetQueryPredicate implements Predicate<AssetState> {
return asPredicate(p).test(Optional.ofNullable(value)
.flatMap(Values::getArray)
.orElse(null));
+ } else if (predicate instanceof CalendarEventPredicate) {
+
+ CalendarEventPredicate p = (CalendarEventPredicate) predicate;
+ return asPredicate(p).test(Values.getObject(value).flatMap(CalendarEvent::fromValue).orElse(null));
} else {
// TODO Implement more
throw new UnsupportedOperationException(
@@ -455,7 +466,77 @@ public class AssetQueryPredicate implements Predicate<AssetState> {
};
}
- public static Predicate<Meta> asPredicate(Supplier<Long> currentMillisProducer, AttributeMetaPredicate predicate) {
+ public static Predicate<CalendarEvent> asPredicate(CalendarEventPredicate p) {
+
+ return calendarEvent -> {
+ if (calendarEvent == null) {
+ return true;
+ }
+
+ Date when = p.timestamp;
+
+ Pair<Long, Long> nextOrActive = getNextOrActiveFromTo(calendarEvent, when);
+ if (nextOrActive == null) {
+ return false;
+ }
+
+ return nextOrActive.key <= when.getTime() && nextOrActive.value > when.getTime();
+ };
+ }
+
+ public static Pair<Long, Long> getNextOrActiveFromTo(CalendarEvent calendarEvent, Date when) {
+
+ if (calendarEvent.getEnd() == null) {
+ return new Pair<>(calendarEvent.getStart().getTime(), Long.MAX_VALUE);
+ }
+
+ if (calendarEvent.getStart().before(when) && calendarEvent.getEnd().after(when) && (calendarEvent.getEnd().getTime()-when.getTime() > 1000)) {
+ return new Pair<>(calendarEvent.getStart().getTime(), calendarEvent.getEnd().getTime());
+ }
+
+ if (calendarEvent.getRecurrence() == null) {
+ if (calendarEvent.getEnd().before(when)) {
+ return null;
+ }
+ return new Pair<>(calendarEvent.getStart().getTime(), calendarEvent.getEnd().getTime());
+ }
+
+ RecurrenceRule recurrenceRule = calendarEvent.getRecurrence();
+ Recur recurrence;
+
+ if (recurrenceRule.getCount() != null) {
+ recurrence = new Recur(recurrenceRule.getFrequency().name(), recurrenceRule.getCount());
+ } else if (recurrenceRule.getUntil() != null) {
+ recurrence = new Recur(recurrenceRule.getFrequency().name(),
+ new net.fortuna.ical4j.model.Date(recurrenceRule.getUntil()));
+ } else {
+ recurrence = new Recur(recurrenceRule.getFrequency().name(), null);
+ }
+
+ if (recurrenceRule.getInterval() != null) {
+ recurrence.setInterval(recurrenceRule.getInterval());
+ }
+
+ long whenMillis = when.toInstant().minus(calendarEvent.getEnd().getTime() - calendarEvent.getStart().getTime(), ChronoUnit.MILLIS).toEpochMilli();
+ DateList matches = recurrence.getDates(new net.fortuna.ical4j.model.DateTime(calendarEvent.getStart()), new net.fortuna.ical4j.model.DateTime(whenMillis), new net.fortuna.ical4j.model.DateTime(Long.MAX_VALUE), net.fortuna.ical4j.model.parameter.Value.DATE_TIME, 2);
+
+ if (matches.isEmpty()) {
+ return null;
+ }
+
+ long endTime = matches.get(0).getTime() + (calendarEvent.getEnd().getTime()-calendarEvent.getStart().getTime());
+
+ if (endTime <= when.getTime()) {
+ if (matches.size() == 2) {
+ return new Pair<>(matches.get(1).getTime(), matches.get(1).getTime() + (calendarEvent.getEnd().getTime()-calendarEvent.getStart().getTime()));
+ }
+ return null;
+ }
+
+ return new Pair<>(matches.get(0).getTime(), endTime);
+ }
+
+ public static Predicate<Meta> asPredicate(Supplier<Long> currentMillisProducer, MetaPredicate predicate) {
Predicate<MetaItem> metaItemPredicate = metaItem -> {
if (predicate.itemNamePredicate != null) {
@@ -544,14 +625,14 @@ public class AssetQueryPredicate implements Predicate<AssetState> {
if (TimeUtil.isTimeDuration(dateTimePredicate.value)) {
from = currentMillis + TimeUtil.parseTimeDuration(dateTimePredicate.value);
} else {
- from = ZonedDateTime.parse(dateTimePredicate.value).toInstant().toEpochMilli();
+ from = TimeUtil.parseTimeIso8601(dateTimePredicate.value);
}
if (dateTimePredicate.operator == AssetQuery.Operator.BETWEEN) {
if (TimeUtil.isTimeDuration(dateTimePredicate.rangeValue)) {
to = currentMillis + TimeUtil.parseTimeDuration(dateTimePredicate.rangeValue);
} else {
- to = ZonedDateTime.parse(dateTimePredicate.rangeValue).toInstant().toEpochMilli();
+ to = TimeUtil.parseTimeIso8601(dateTimePredicate.rangeValue);
}
}
} catch (IllegalArgumentException e) {
diff --git a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
index 6617c506d..b5d693596 100644
--- a/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
+++ b/manager/src/main/java/org/openremote/manager/rules/JsonRulesBuilder.java
@@ -76,6 +76,10 @@ public class JsonRulesBuilder extends RulesBuilder {
}
}
+ /**
+ * This stores all state for a given {@link RuleCondition} and calculates which {@link AssetState}s match and don't
+ * match the condition.
+ */
static class RuleTriggerState {
final TimerService timerService;
@@ -412,26 +416,41 @@ public class JsonRulesBuilder extends RulesBuilder {
final protected TimerService timerService;
final protected Assets assetsFacade;
final protected Users usersFacade;
- final protected NotificationsFacade notificationFacade;
+ final protected NotificationsFacade notificationsFacade;
final protected ManagerExecutorService executorService;
final protected BiConsumer<Runnable, Long> scheduledActionConsumer;
final protected Map<String, RuleEvaluationResult> ruleEvaluationMap = new HashMap<>();
+ final protected JsonRule[] jsonRules;
- public JsonRulesBuilder(TimerService timerService, AssetStorageService assetStorageService, ManagerExecutorService executorService, Assets assetsFacade, Users usersFacade, NotificationsFacade notificationFacade, BiConsumer<Runnable, Long> scheduledActionConsumer) {
+ public JsonRulesBuilder(JsonRule[] jsonRules, TimerService timerService, AssetStorageService assetStorageService, ManagerExecutorService executorService, Assets assetsFacade, Users usersFacade, NotificationsFacade notificationsFacade, BiConsumer<Runnable, Long> scheduledActionConsumer) {
this.timerService = timerService;
this.assetStorageService = assetStorageService;
this.executorService = executorService;
this.assetsFacade = assetsFacade;
this.usersFacade = usersFacade;
- this.notificationFacade = notificationFacade;
+ this.notificationsFacade = notificationsFacade;
this.scheduledActionConsumer = scheduledActionConsumer;
+ this.jsonRules = jsonRules;
+
+ Arrays.stream(jsonRules).forEach(this::add);
+ }
+
+ public void stop(RulesFacts facts) {
+ Arrays.stream(jsonRules).forEach(jsonRule ->
+ executeRuleActions(jsonRule, jsonRule.onStop, "onStop", false, facts, null, assetsFacade, usersFacade, notificationsFacade, timerService, assetStorageService, this.scheduledActionConsumer));
+ }
+
+ public void start(RulesFacts facts) {
+ Arrays.stream(jsonRules).forEach(jsonRule ->
+ executeRuleActions(jsonRule, jsonRule.onStart, "onStart", false, facts, null, assetsFacade, usersFacade, notificationsFacade, timerService, assetStorageService, this.scheduledActionConsumer));
+ onAssetStatesChanged(facts);
}
public void onAssetStatesChanged(RulesFacts facts) {
ruleEvaluationMap.values().forEach(triggerStateMap -> triggerStateMap.conditionStateMap.values().forEach(ruleConditionState -> ruleConditionState.updateUnfilteredAssetStates(facts)));
}
- public JsonRulesBuilder add(JsonRule rule) {
+ protected JsonRulesBuilder add(JsonRule rule) {
if (ruleEvaluationMap.containsKey(rule.name)) {
throw new IllegalArgumentException("Rules must have a unique name within a ruleset, rule name '" + rule.name + "' already used");
@@ -469,10 +488,10 @@ public class JsonRulesBuilder extends RulesBuilder {
return this;
}
- protected void addRuleTriggerStates(LogicGroup<RuleCondition> ruleConditionCondition, boolean trackUnmatched, int index, Map<String, RuleTriggerState> triggerStateMap, RuleConditionReset defaultReset) {
- if (ruleConditionCondition != null) {
- if (ruleConditionCondition.getItems().size() > 0) {
- for (RuleCondition ruleCondition : ruleConditionCondition.getItems()) {
+ protected void addRuleTriggerStates(LogicGroup<RuleCondition> ruleConditionGroup, boolean trackUnmatched, int index, Map<String, RuleTriggerState> triggerStateMap, RuleConditionReset defaultReset) {
+ if (ruleConditionGroup != null) {
+ if (ruleConditionGroup.getItems().size() > 0) {
+ for (RuleCondition ruleCondition : ruleConditionGroup.getItems()) {
if (TextUtil.isNullOrEmpty(ruleCondition.tag)) {
ruleCondition.tag = Integer.toString(index);
}
@@ -483,8 +502,8 @@ public class JsonRulesBuilder extends RulesBuilder {
index++;
}
}
- if (ruleConditionCondition.groups != null && ruleConditionCondition.groups.size() > 0) {
- for (LogicGroup<RuleCondition> childRuleTriggerCondition : ruleConditionCondition.groups) {
+ if (ruleConditionGroup.groups != null && ruleConditionGroup.groups.size() > 0) {
+ for (LogicGroup<RuleCondition> childRuleTriggerCondition : ruleConditionGroup.groups) {
addRuleTriggerStates(childRuleTriggerCondition, trackUnmatched, index, triggerStateMap, defaultReset);
}
}
@@ -520,12 +539,12 @@ public class JsonRulesBuilder extends RulesBuilder {
try {
log(Level.FINER, "Triggered rule so executing 'then' actions for rule: " + rule.name);
if (ruleEvaluationResult.thenMatched) {
- executeRuleActions(rule, rule.then, "then", false, facts, ruleEvaluationResult.conditionStateMap, assetsFacade, usersFacade, notificationFacade, timerService, assetStorageService, scheduledActionConsumer);
+ executeRuleActions(rule, rule.then, "then", false, facts, ruleEvaluationResult.conditionStateMap, assetsFacade, usersFacade, notificationsFacade, timerService, assetStorageService, scheduledActionConsumer);
}
if (rule.otherwise != null && ruleEvaluationResult.otherwiseMatched) {
log(Level.FINER, "Triggered rule so executing 'otherwise' actions for rule: " + rule.name);
- executeRuleActions(rule, rule.otherwise, "otherwise", true, facts, ruleEvaluationResult.conditionStateMap, assetsFacade, usersFacade, notificationFacade, timerService, assetStorageService, scheduledActionConsumer);
+ executeRuleActions(rule, rule.otherwise, "otherwise", true, facts, ruleEvaluationResult.conditionStateMap, assetsFacade, usersFacade, notificationsFacade, timerService, assetStorageService, scheduledActionConsumer);
}
} catch (Exception e) {
log(Level.SEVERE, "Exception thrown during rule RHS execution", e);
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
index 51b430bf0..6e357bfe0 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesEngine.java
@@ -37,10 +37,12 @@ import org.openremote.model.attribute.MetaItemType;
import org.openremote.model.query.filter.GeofencePredicate;
import org.openremote.model.query.filter.LocationAttributePredicate;
import org.openremote.model.rules.*;
+import org.openremote.model.util.TextUtil;
import java.util.*;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -79,6 +81,10 @@ public class RulesEngine<T extends Ruleset> {
// Separate logger for periodic stats printer
public static final Logger STATS_LOG = Logger.getLogger("org.openremote.rules.RulesEngineStats");
+ // Here to facilitate testing
+ protected static BiConsumer<RulesEngine, RulesetDeployment> PAUSE_SCHEDULER = RulesEngine::schedulePause;
+ protected static BiConsumer<RulesEngine, RulesetDeployment> UNPAUSE_SCHEDULER = RulesEngine::scheduleUnpause;
+
final protected TimerService timerService;
final protected ManagerExecutorService executorService;
final protected AssetStorageService assetStorageService;
@@ -99,7 +105,8 @@ public class RulesEngine<T extends Ruleset> {
protected boolean trackLocationPredicates;
protected ScheduledFuture fireTimer;
protected ScheduledFuture statsTimer;
- protected List<RulesetDeployment> newlyAddedDeployments = new ArrayList<>();
+ protected Map<Long, ScheduledFuture> pauseTimers = new HashMap<>();
+ protected Map<Long, ScheduledFuture> unpauseTimers = new HashMap<>();
protected boolean assetStatesChanged = false;
// Only used to optimize toString(), contains the details of this engine
@@ -160,8 +167,7 @@ public class RulesEngine<T extends Ruleset> {
public boolean isError() {
for (RulesetDeployment deployment : deployments.values()) {
- if (((deployment.status == COMPILATION_ERROR || deployment.getStatus() == EXECUTION_ERROR) &&
- !deployment.getRuleset().isContinueOnError()) || deployment.error instanceof RulesLoopException) {
+ if (deployment.isError() || deployment.getError() instanceof RulesLoopException) {
return true;
}
}
@@ -169,7 +175,7 @@ public class RulesEngine<T extends Ruleset> {
}
public int getExecutionErrorDeploymentCount() {
- return (int) deployments.values().stream().filter(deployment -> deployment.getStatus() == EXECUTION_ERROR).count();
+ return (int) deployments.values().stream().filter(deployment -> deployment.getStatus() == EXECUTION_ERROR || deployment.getStatus() == LOOP_ERROR).count();
}
public int getCompilationErrorDeploymentCount() {
@@ -192,74 +198,56 @@ public class RulesEngine<T extends Ruleset> {
}
/**
- * @return <code>true</code> if all rulesets are {@link RulesetStatus#DEPLOYED} and this engine can be
- * started.
+ * @return <code>true</code> if all rulesets are not in an error state.
*/
- public boolean isDeployed() {
- return deployments.values().stream().allMatch(rd -> rd.getStatus() == DEPLOYED || rd.getRuleset().isContinueOnError());
+ public boolean canStart() {
+ return deployments.values().stream().noneMatch(rd -> rd.getStatus() == COMPILATION_ERROR && !rd.isContinueOnError());
}
public void addRuleset(T ruleset) {
- if (ruleset == null || ruleset.getRules() == null || ruleset.getRules().isEmpty()) {
- // Assume it's a success if deploying an empty ruleset
- LOG.finest("Ruleset is empty so no rules to deploy");
- return;
- }
+ // Check for previous version of this ruleset
RulesetDeployment deployment = deployments.get(ruleset.getId());
stop();
- // Check if ruleset is already deployed (maybe an older version)
if (deployment != null) {
- deployment.onStop(facts);
- deployment.stop();
- LOG.info("Removing ruleset deployment: " + ruleset);
- deployments.remove(ruleset.getId());
- updateDeploymentInfo();
+ removeRuleset(deployment.ruleset);
}
deployment = new RulesetDeployment(ruleset, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationFacade);
- newlyAddedDeployments.add(deployment);
-
- boolean compilationSuccessful = deployment.start();
-
- if (!compilationSuccessful) {
- // If any other ruleset is DEPLOYED in this scope, demote to READY
- for (RulesetDeployment rd : deployments.values()) {
- if (rd.getStatus() == DEPLOYED) {
- rd.setStatus(READY);
- publishRulesetStatus(
- rd.getRuleset(),
- rd.getStatus(),
- rd.getErrorMessage()
- );
- }
- }
+ boolean compiled;
+
+ if (TextUtil.isNullOrEmpty(ruleset.getRules())) {
+ LOG.finest("Ruleset is empty so no rules to deploy: " + ruleset.getName());
+ deployment.setStatus(EMPTY);
+ publishRulesetStatus(deployment);
+ } else if (!ruleset.isEnabled()) {
+ LOG.finest("Ruleset is disabled: " + ruleset.getName());
+ deployment.setStatus(DISABLED);
+ publishRulesetStatus(deployment);
} else {
- // If any other ruleset is READY in this scope, promote to DEPLOYED
- for (RulesetDeployment rd : deployments.values()) {
- if (rd.getStatus() == READY) {
- rd.setStatus(DEPLOYED);
- publishRulesetStatus(
- rd.getRuleset(),
- rd.getStatus(),
- rd.getErrorMessage()
- );
- }
+ deployment.updateValidity();
+ if (deployment.hasExpired()) {
+ LOG.fine("Ruleset validity period has expired: " + ruleset.getName());
+ deployment.setStatus(EXPIRED);
+ publishRulesetStatus(deployment);
+ compiled = true;
+ } else {
+ compiled = deployment.compile();
+ }
+
+ if (!compiled) {
+ LOG.log(Level.SEVERE, "Ruleset compilation error: " + ruleset.getName(), deployment.getError());
+ deployment.setStatus(COMPILATION_ERROR);
+ publishRulesetStatus(deployment);
+ } else if (running) {
+ startRuleset(deployment);
}
}
- // Add new ruleset and set its status to either DEPLOYED or COMPILATION_ERROR
- deployment.setStatus(compilationSuccessful ? DEPLOYED : COMPILATION_ERROR);
deployments.put(ruleset.getId(), deployment);
updateDeploymentInfo();
-
- publishRulesetStatus(
- ruleset,
- deployment.getStatus(),
- deployment.getErrorMessage()
- );
start();
}
@@ -274,59 +262,45 @@ public class RulesEngine<T extends Ruleset> {
return deployments.size() == 0;
}
- stop();
- deployment.onStop(facts);
- deployment.stop();
- updateDeploymentInfo();
+ stopRuleset(deployment);
- publishRulesetStatus(ruleset, ruleset.isEnabled() ? REMOVED : DISABLED, null);
-
- // If there are no deployments with COMPILATION_ERROR, promote all which are READY to DEPLOYED
- boolean anyDeploymentsHaveCompilationError = deployments
- .values()
- .stream()
- .anyMatch(rd -> rd.getStatus() == COMPILATION_ERROR);
-
- if (!anyDeploymentsHaveCompilationError) {
- deployments.values().forEach(rd -> {
- if (rd.getStatus() == READY) {
- rd.setStatus(DEPLOYED);
- publishRulesetStatus(
- rd.getRuleset(),
- rd.getStatus(),
- rd.getErrorMessage()
- );
- }
- });
- }
+ deployment.setStatus(REMOVED);
+ publishRulesetStatus(deployment);
+ deployments.remove(ruleset.getId());
- if (deployments.size() > 0) {
- start();
- return false;
- } else {
- publishRulesEngineStatus();
- return true;
- }
+ ScheduledFuture timer = pauseTimers.remove(ruleset.getId());
+ if (timer != null) timer.cancel(true);
+ timer = unpauseTimers.remove(ruleset.getId());
+ if (timer != null) timer.cancel(true);
+
+ updateDeploymentInfo();
+ start();
+
+ return deployments.size() == 0;
}
public void start() {
- if (isRunning()) {
+ if (running) {
return;
}
- if (!isDeployed()) {
- LOG.fine("Cannot start rules engine, not all rulesets are status " + DEPLOYED);
+ if (deployments.size() == 0) {
+ LOG.finest("No rulesets so nothing to start");
return;
}
- if (deployments.size() == 0) {
- LOG.finest("No rulesets so nothing to start");
+ if (!canStart()) {
+ LOG.fine("Cannot start rules engine one or more rulesets in an error state");
return;
}
LOG.info("Starting: " + this);
running = true;
trackLocationPredicates = true;
+
+ deployments.values().forEach(this::startRuleset);
+
+ updateDeploymentInfo();
publishRulesEngineStatus();
fire();
@@ -341,6 +315,83 @@ public class RulesEngine<T extends Ruleset> {
}
}
+
+ public void stop() {
+ stop(false);
+ }
+
+ public void stop(boolean systemShutdownInProgress) {
+ if (!running) {
+ return;
+ }
+ LOG.info("Stopping: " + this);
+ if (fireTimer != null) {
+ fireTimer.cancel(true);
+ fireTimer = null;
+ }
+ if (statsTimer != null) {
+ statsTimer.cancel(true);
+ statsTimer = null;
+ }
+ pauseTimers.values().forEach(pauseTimer -> pauseTimer.cancel(true));
+ pauseTimers.clear();
+ unpauseTimers.values().forEach(unpauseTimer -> unpauseTimer.cancel(true));
+ unpauseTimers.clear();
+
+ deployments.values().forEach(this::stopRuleset);
+ running = false;
+
+ if (!systemShutdownInProgress && assetLocationPredicatesConsumer != null) {
+ assetLocationPredicatesConsumer.accept(this, null);
+ }
+
+ updateDeploymentInfo();
+ publishRulesEngineStatus();
+ }
+
+ protected void startRuleset(RulesetDeployment deployment) {
+ if (!running) {
+ return;
+ }
+
+ if (deployment.getStatus() == COMPILATION_ERROR || deployment.getStatus() == DISABLED || deployment.getStatus() == EXPIRED) {
+ return;
+ }
+
+ deployment.updateValidity();
+
+ if (deployment.hasExpired()) {
+ deployment.setStatus(EXPIRED);
+ publishRulesetStatus(deployment);
+ return;
+ }
+
+ if (deployment.getValidFrom() > timerService.getCurrentTimeMillis()) {
+ // Not ready to start yet so pause
+ pauseRuleset(deployment);
+ } else {
+ deployment.setStatus(DEPLOYED);
+ publishRulesetStatus(deployment);
+ deployment.start(facts);
+
+ if (deployment.getValidTo() != Long.MAX_VALUE) {
+ PAUSE_SCHEDULER.accept(this, deployment);
+ }
+ }
+ }
+
+ protected void stopRuleset(RulesetDeployment deployment) {
+ if (!running) {
+ return;
+ }
+
+ if (deployment.getStatus() == DEPLOYED) {
+ deployment.stop(facts);
+ deployment.setStatus(READY);
+ publishRulesetStatus(deployment);
+ }
+ }
+
public void fire() {
withLock(toString() + "::scheduleFire", () -> {
// Schedule a firing within the guaranteed expiration time (so not immediately), and
@@ -391,47 +442,42 @@ public class RulesEngine<T extends Ruleset> {
// Remove any expired temporary facts
facts.removeExpiredTemporaryFacts();
- // Call on start for any newly deployed rulesets
- newlyAddedDeployments.forEach(rulesetDeployment -> {
- rulesetDeployment.onStart(facts);
- if (!assetStatesChanged) {
- rulesetDeployment.onAssetStatesChanged(facts);
- }
- });
- newlyAddedDeployments.clear();
-
// Notify rulesets if assetstates changed
boolean notifyAssetStatesChanged = assetStatesChanged;
assetStatesChanged = false;
for (RulesetDeployment deployment : deployments.values()) {
try {
- if (notifyAssetStatesChanged) {
- deployment.onAssetStatesChanged(facts);
- }
- RULES_LOG.fine("Firing rules @" + clock + " of: " + deployment);
+ if (deployment.getStatus() == DEPLOYED) {
- // If full detail logging is enabled
- if (RULES_LOG.isLoggable(Level.FINEST)) {
- // Log asset states and events before firing (note that this will log at INFO)
- facts.logFacts(RULES_LOG);
- }
+ RULES_LOG.fine("Firing rules @" + clock + " of: " + deployment);
- // Reset facts for this firing (loop detection etc.)
- facts.reset();
+ // If full detail logging is enabled
+ if (RULES_LOG.isLoggable(Level.FINEST)) {
+ // Log asset states and events before firing (note that this will log at INFO)
+ facts.logFacts(RULES_LOG);
+ }
+
+ // Reset facts for this firing (loop detection etc.)
+ facts.reset();
- long startTimestamp = System.currentTimeMillis();
- lastFireTimestamp = startTimestamp;
- engine.fire(deployment.getRules(), facts);
- RULES_LOG.fine("Rules executed in: " + (System.currentTimeMillis() - startTimestamp) + "ms");
+ if (notifyAssetStatesChanged) {
+ deployment.onAssetStatesChanged(facts);
+ }
+
+ long startTimestamp = System.currentTimeMillis();
+ lastFireTimestamp = startTimestamp;
+ engine.fire(deployment.getRules(), facts);
+ RULES_LOG.fine("Rules executed in: " + (System.currentTimeMillis() - startTimestamp) + "ms");
+ }
} catch (Exception ex) {
LOG.log(Level.SEVERE, "On " + RulesEngine.this + ", error firing rules of: " + deployment, ex);
- deployment.setStatus(EXECUTION_ERROR);
+ deployment.setStatus(ex instanceof RulesLoopException ? LOOP_ERROR : EXECUTION_ERROR);
deployment.setError(ex);
- publishRulesetStatus(deployment.getRuleset(), deployment.getStatus(), deployment.getErrorMessage());
+ publishRulesetStatus(deployment);
// TODO We only get here on LHS runtime errors, RHS runtime errors are in RuleFacts.onFailure()
if (ex instanceof RulesLoopException || !deployment.ruleset.isContinueOnError()) {
@@ -452,37 +498,11 @@ public class RulesEngine<T extends Ruleset> {
}
}
- public void stop() {
- stop(false);
- }
-
- public void stop(boolean systemShutdownInProgress) {
- if (!isRunning()) {
- return;
- }
- LOG.info("Stopping: " + this);
- if (fireTimer != null) {
- fireTimer.cancel(true);
- fireTimer = null;
- }
- if (statsTimer != null) {
- statsTimer.cancel(true);
- statsTimer = null;
- }
- running = false;
-
- if (!systemShutdownInProgress && assetLocationPredicatesConsumer != null) {
- assetLocationPredicatesConsumer.accept(this, null);
- }
-
- publishRulesEngineStatus();
- }
-
public void updateFact(AssetState assetState, boolean fireImmediately) {
assetStatesChanged = true;
facts.putAssetState(assetState);
trackLocationPredicates = trackLocationPredicates || assetState.getAttributeName().equals(AttributeType.LOCATION.getAttributeName());
- if (fireImmediately) {
+ if (running && fireImmediately) {
fire();
}
}
@@ -491,14 +511,18 @@ public class RulesEngine<T extends Ruleset> {
assetStatesChanged = true;
facts.removeAssetState(assetState);
trackLocationPredicates = trackLocationPredicates || assetState.getAttributeName().equals(AttributeType.LOCATION.getAttributeName());
- fire();
+ if (running) {
+ fire();
+ }
}
public void insertFact(String expires, AssetState assetState) {
assetStatesChanged = true;
facts.insertAssetEvent(expires, assetState);
trackLocationPredicates = trackLocationPredicates || assetState.getAttributeName().equals(AttributeType.LOCATION.getAttributeName());
- fire();
+ if (running) {
+ fire();
+ }
}
protected void updateDeploymentInfo() {
@@ -542,15 +566,11 @@ public class RulesEngine<T extends Ruleset> {
}
protected RulesEngineStatus getStatus() {
- return getStatus(getCompilationErrorDeploymentCount(), getExecutionErrorDeploymentCount());
- }
-
- protected RulesEngineStatus getStatus(int compilationErrors, int executionErrors) {
if (isRunning()) {
- return compilationErrors > 0 || executionErrors > 0 ? RulesEngineStatus.ERROR : RulesEngineStatus.RUNNING;
+ return RulesEngineStatus.RUNNING;
}
- return compilationErrors > 0 || executionErrors > 0 ? RulesEngineStatus.ERROR : deployments.isEmpty() ? null : RulesEngineStatus.STOPPED;
+ return deployments.values().stream().anyMatch(RulesetDeployment::isError) ? RulesEngineStatus.ERROR : RulesEngineStatus.STOPPED;
}
protected void publishRulesEngineStatus() {
@@ -560,7 +580,7 @@ public class RulesEngine<T extends Ruleset> {
int compilationErrors = getCompilationErrorDeploymentCount();
int executionErrors = getExecutionErrorDeploymentCount();
RulesEngineInfo engineInfo = new RulesEngineInfo(
- getStatus(compilationErrors, executionErrors),
+ getStatus(),
compilationErrors,
executionErrors);
@@ -577,13 +597,14 @@ public class RulesEngine<T extends Ruleset> {
});
}
- protected void publishRulesetStatus(Ruleset ruleset, RulesetStatus status, String error) {
+ protected void publishRulesetStatus(RulesetDeployment deployment) {
withLock(getClass().getSimpleName() + "::publishRulesetStatus", () -> {
+ Ruleset ruleset = deployment.ruleset;
String engineId = id == null ? null : id.getRealm().orElse(id.getAssetId().orElse(null));
- ruleset.setStatus(status);
- ruleset.setError(error);
+ ruleset.setStatus(deployment.getStatus());
+ ruleset.setError(deployment.getErrorMessage());
RulesetChangedEvent event = new RulesetChangedEvent(
timerService.getCurrentTimeMillis(),
@@ -598,6 +619,55 @@ public class RulesEngine<T extends Ruleset> {
});
}
+ protected void schedulePause(RulesetDeployment deployment) {
+ long delay = deployment.getValidTo() - timerService.getCurrentTimeMillis();
+ LOG.info("Scheduling pause of ruleset at '" + new Date(deployment.getValidTo()).toString() + "' ("+ delay + "ms): " + deployment.ruleset.getName());
+ pauseTimers.put(deployment.getId(), executorService.schedule(() -> pauseRuleset(deployment), delay));
+ }
+
+ protected void pauseRuleset(RulesetDeployment deployment) {
+ pauseTimers.remove(deployment.getId());
+
+ if (!running) {
+ return;
+ }
+
+ withLock(getClass().getSimpleName() + ":pauseRuleset", () -> {
+ LOG.info("Pausing ruleset: " + deployment.getRuleset().getName());
+ stopRuleset(deployment);
+ deployment.updateValidity();
+
+ if (deployment.hasExpired()) {
+ deployment.setStatus(EXPIRED);
+ publishRulesetStatus(deployment);
+ } else {
+ deployment.setStatus(PAUSED);
+ publishRulesetStatus(deployment);
+ UNPAUSE_SCHEDULER.accept(this, deployment);
+ }
+ });
+
+ }
+
+ protected void scheduleUnpause(RulesetDeployment deployment) {
+ long delay = deployment.getValidFrom() - timerService.getCurrentTimeMillis();
+ LOG.info("Scheduling un-pause of ruleset at '" + new Date(deployment.getValidFrom()).toString() + "' ("+ delay + "ms): " + deployment.ruleset.getName());
+ unpauseTimers.put(deployment.getId(), executorService.schedule(() -> unPauseRuleset(deployment), delay));
+ }
+
+ protected void unPauseRuleset(RulesetDeployment deployment) {
+ unpauseTimers.remove(deployment.getId());
+
+ if (!running) {
+ return;
+ }
+
+ withLock(getClass().getSimpleName() + "::unpauseRuleset", () -> {
+ LOG.info("Un-pausing ruleset: " + deployment.getRuleset().getName());
+ startRuleset(deployment);
+ });
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
index b363dde3f..d16063b8d 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesResourceImpl.java
@@ -28,6 +28,7 @@ import org.openremote.model.asset.Asset;
import org.openremote.model.query.AssetQuery;
import org.openremote.model.asset.UserAsset;
import org.openremote.model.http.RequestParams;
+import org.openremote.model.query.RulesetQuery;
import org.openremote.model.rules.*;
import org.openremote.model.rules.geofence.GeofenceDefinition;
import org.openremote.model.security.ClientRole;
@@ -110,7 +111,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
int executionErrorCount = engine.getExecutionErrorDeploymentCount();
return new RulesEngineInfo(
- engine.getStatus(compilationErrorCount, executionErrorCount),
+ engine.getStatus(),
compilationErrorCount,
executionErrorCount
);
@@ -122,7 +123,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- List<GlobalRuleset> result = rulesetStorageService.findGlobalRulesets(false, language, fullyPopulate);
+ List<GlobalRuleset> result = rulesetStorageService.findAll(GlobalRuleset.class, new RulesetQuery().setLanguage(language).setFullyPopulate(fullyPopulate));
// Try and retrieve transient status and error data
result.forEach(ruleset ->
@@ -138,15 +139,21 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
}
@Override
- public TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, String realmId, Ruleset.Lang language, boolean fullyPopulate) {
+ public TenantRuleset[] getTenantRulesets(@BeanParam RequestParams requestParams, String realm, Ruleset.Lang language, boolean fullyPopulate) {
- if (isAuthenticated() && !isRealmAccessibleByUser(realmId)) {
+ if (isAuthenticated() && !isRealmAccessibleByUser(realm)) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
boolean publicOnly = !isAuthenticated() || isRestrictedUser() | !hasResourceRole(ClientRole.READ_RULES.getValue(), Constants.KEYCLOAK_CLIENT_ID);
- List<TenantRuleset> result = rulesetStorageService.findTenantRulesets(realmId, publicOnly, false, language, fullyPopulate);
+ List<TenantRuleset> result = rulesetStorageService.findAll(
+ TenantRuleset.class,
+ new RulesetQuery().
+ setRealm(realm)
+ .setLanguage(language)
+ .setFullyPopulate(fullyPopulate)
+ .setPublicOnly(publicOnly));
// Try and retrieve transient status and error data
result.forEach(ruleset ->
@@ -173,7 +180,14 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
boolean publicOnly = !isAuthenticated() || (isRestrictedUser() && !assetStorageService.isUserAsset(getUserId(), assetId)) || !hasResourceRole(ClientRole.READ_RULES.getValue(), Constants.KEYCLOAK_CLIENT_ID);
- List<AssetRuleset> result = rulesetStorageService.findAssetRulesets(asset.getRealm(), assetId, publicOnly, false, language, fullyPopulate);
+ List<AssetRuleset> result = rulesetStorageService.findAll(
+ AssetRuleset.class,
+ new RulesetQuery()
+ .setRealm(asset.getRealm())
+ .setAssetIds(assetId)
+ .setPublicOnly(publicOnly)
+ .setLanguage(language)
+ .setFullyPopulate(fullyPopulate));
// Try and retrieve transient status and error data
result.forEach(ruleset ->
@@ -203,7 +217,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- GlobalRuleset ruleset = rulesetStorageService.findById(GlobalRuleset.class, id);
+ GlobalRuleset ruleset = rulesetStorageService.find(GlobalRuleset.class, id);
if (ruleset == null) {
throw new WebApplicationException(NOT_FOUND);
}
@@ -215,7 +229,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
if (!isSuperUser()) {
throw new WebApplicationException(Response.Status.FORBIDDEN);
}
- GlobalRuleset existingRuleset = rulesetStorageService.findById(GlobalRuleset.class, id);
+ GlobalRuleset existingRuleset = rulesetStorageService.find(GlobalRuleset.class, id);
if (existingRuleset == null)
throw new WebApplicationException(NOT_FOUND);
rulesetStorageService.merge(ruleset);
@@ -247,7 +261,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
@Override
public TenantRuleset getTenantRuleset(@BeanParam RequestParams requestParams, Long id) {
- TenantRuleset ruleset = rulesetStorageService.findById(TenantRuleset.class, id);
+ TenantRuleset ruleset = rulesetStorageService.find(TenantRuleset.class, id);
if (ruleset == null) {
throw new WebApplicationException(NOT_FOUND);
}
@@ -264,7 +278,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
@Override
public void updateTenantRuleset(@BeanParam RequestParams requestParams, Long id, TenantRuleset ruleset) {
- TenantRuleset existingRuleset = rulesetStorageService.findById(TenantRuleset.class, id);
+ TenantRuleset existingRuleset = rulesetStorageService.find(TenantRuleset.class, id);
if (existingRuleset == null) {
throw new WebApplicationException(NOT_FOUND);
}
@@ -287,7 +301,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
@Override
public void deleteTenantRuleset(@BeanParam RequestParams requestParams, Long id) {
- TenantRuleset ruleset = rulesetStorageService.findById(TenantRuleset.class, id);
+ TenantRuleset ruleset = rulesetStorageService.find(TenantRuleset.class, id);
if (ruleset == null) {
return;
}
@@ -325,7 +339,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
@Override
public AssetRuleset getAssetRuleset(@BeanParam RequestParams requestParams, Long id) {
- AssetRuleset ruleset = rulesetStorageService.findById(AssetRuleset.class, id);
+ AssetRuleset ruleset = rulesetStorageService.find(AssetRuleset.class, id);
if (ruleset == null) {
throw new WebApplicationException(NOT_FOUND);
}
@@ -344,7 +358,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
@Override
public void updateAssetRuleset(@BeanParam RequestParams requestParams, Long id, AssetRuleset ruleset) {
- AssetRuleset existingRuleset = rulesetStorageService.findById(AssetRuleset.class, id);
+ AssetRuleset existingRuleset = rulesetStorageService.find(AssetRuleset.class, id);
if (existingRuleset == null) {
throw new WebApplicationException(NOT_FOUND);
}
@@ -370,7 +384,7 @@ public class RulesResourceImpl extends ManagerWebResource implements RulesResour
@Override
public void deleteAssetRuleset(@BeanParam RequestParams requestParams, Long id) {
- AssetRuleset ruleset = rulesetStorageService.findById(AssetRuleset.class, id);
+ AssetRuleset ruleset = rulesetStorageService.find(AssetRuleset.class, id);
if (ruleset == null) {
return;
}
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 9f27314b8..979ed75c3 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesService.java
@@ -41,7 +41,8 @@ import org.openremote.model.asset.AssetAttribute;
import org.openremote.model.attribute.MetaItemType;
import org.openremote.model.attribute.AttributeEvent.Source;
import org.openremote.model.query.AssetQuery;
-import org.openremote.model.query.filter.AttributeMetaPredicate;
+import org.openremote.model.query.RulesetQuery;
+import org.openremote.model.query.filter.MetaPredicate;
import org.openremote.model.query.filter.BooleanPredicate;
import org.openremote.model.query.filter.LocationAttributePredicate;
import org.openremote.model.rules.*;
@@ -65,10 +66,8 @@ import static org.openremote.container.concurrent.GlobalLock.withLockReturning;
import static org.openremote.container.persistence.PersistenceEvent.PERSISTENCE_TOPIC;
import static org.openremote.container.persistence.PersistenceEvent.isPersistenceEventForEntityType;
import static org.openremote.container.util.MapAccess.getString;
-import static org.openremote.model.AbstractValueTimestampHolder.VALUE_TIMESTAMP_FIELD_NAME;
import static org.openremote.model.asset.AssetAttribute.attributesFromJson;
import static org.openremote.model.asset.AssetAttribute.getAddedOrModifiedAttributes;
-import static org.openremote.model.query.AssetQuery.Select.selectExcludePathAndAttributes;
/**
* Manages {@link RulesEngine}s for stored {@link Ruleset}s and processes asset attribute updates.
@@ -215,11 +214,20 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
}
LOG.info("Deploying global rulesets");
- rulesetStorageService.findGlobalRulesets(true, null, true).forEach(this::deployGlobalRuleset);
+ rulesetStorageService.findAll(
+ GlobalRuleset.class,
+ new RulesetQuery()
+ .setEnabledOnly(true)
+ .setFullyPopulate(true)
+ ).forEach(this::deployGlobalRuleset);
LOG.info("Deploying tenant rulesets");
tenants = identityService.getIdentityProvider().getTenants();
- rulesetStorageService.findTenantRulesets(false, true, null, true)
+ rulesetStorageService.findAll(
+ TenantRuleset.class,
+ new RulesetQuery()
+ .setEnabledOnly(true)
+ .setFullyPopulate(true))
.stream()
.filter(rd ->
Arrays.stream(tenants)
@@ -228,7 +236,12 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
LOG.info("Deploying asset rulesets");
// Group by asset ID then tenant and check tenant is enabled
- deployAssetRulesets(rulesetStorageService.findAssetRulesets(null, null, false, true, null, true));
+ deployAssetRulesets(
+ rulesetStorageService.findAll(
+ AssetRuleset.class,
+ new RulesetQuery()
+ .setEnabledOnly(true)
+ .setFullyPopulate(true)));
LOG.info("Loading all assets with fact attributes to initialize state of rules engines");
Stream<Pair<Asset, Stream<AssetAttribute>>> assetRuleAttributes = findRuleStateAttributes();
@@ -345,11 +358,22 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
} else {
// Create tenant rules engines for this tenant if it has any rulesets
rulesetStorageService
- .findTenantRulesets(tenant.getRealm(), false, true, null, true)
+ .findAll(
+ TenantRuleset.class,
+ new RulesetQuery()
+ .setRealm(tenant.getRealm())
+ .setFullyPopulate(true)
+ .setEnabledOnly(true))
.forEach(this::deployTenantRuleset);
// Create any asset rules engines for assets in this realm that have rulesets
- deployAssetRulesets(rulesetStorageService.findAssetRulesetsByRealm(tenant.getRealm(), false, true, null, true));
+ deployAssetRulesets(
+ rulesetStorageService.findAll(
+ AssetRuleset.class,
+ new RulesetQuery()
+ .setRealm(tenant.getRealm())
+ .setEnabledOnly(true)
+ .setFullyPopulate(true)));
}
});
}
@@ -464,7 +488,6 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
if (newEngine != null) {
// Push all existing facts into the engine, this is an initial import of state so fire delayed
assetStates.forEach(assetState -> newEngine.updateFact(assetState, false));
- newEngine.fire();
}
} else if (ruleset instanceof TenantRuleset) {
@@ -477,20 +500,18 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
newEngine.updateFact(assetState, false);
}
});
- newEngine.fire();
}
} else if (ruleset instanceof AssetRuleset) {
// Must reload from the database, the ruleset might not be completely hydrated on CREATE or UPDATE
- AssetRuleset assetRuleset = rulesetStorageService.findById(AssetRuleset.class, ruleset.getId());
+ AssetRuleset assetRuleset = rulesetStorageService.find(AssetRuleset.class, ruleset.getId());
RulesEngine newEngine = deployAssetRuleset(assetRuleset);
if (newEngine != null) {
// Push all existing facts for this asset (and it's children into the engine), this is an
// initial import of state so fire delayed
getAssetStatesInScope(((AssetRuleset) ruleset).getAssetId())
.forEach(assetState -> newEngine.updateFact(assetState, false));
- newEngine.fire();
}
}
}
@@ -532,6 +553,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
}
if (globalEngine.removeRuleset(ruleset)) {
+ globalEngine.stop();
globalEngine = null;
}
});
@@ -542,7 +564,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
final boolean[] created = {false};
// Look for existing rules engines for this tenant
- RulesEngine<TenantRuleset> tenentRulesEngine = tenantEngines
+ RulesEngine<TenantRuleset> tenantRulesEngine = tenantEngines
.computeIfAbsent(ruleset.getRealm(), (realm) -> {
created[0] = true;
return new RulesEngine<>(
@@ -558,9 +580,9 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
);
});
- tenentRulesEngine.addRuleset(ruleset);
+ tenantRulesEngine.addRuleset(ruleset);
- return created[0] ? tenentRulesEngine : null;
+ return created[0] ? tenantRulesEngine : null;
});
}
@@ -572,6 +594,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
}
if (rulesEngine.removeRuleset(ruleset)) {
+ rulesEngine.stop();
tenantEngines.remove(ruleset.getRealm());
}
});
@@ -633,12 +656,13 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
protected void undeployAssetRuleset(AssetRuleset ruleset) {
withLock(getClass().getSimpleName() + "::undeployAssetRuleset", () -> {
- RulesEngine<AssetRuleset> assetRulesEngine = assetEngines.get(ruleset.getAssetId());
- if (assetRulesEngine == null) {
+ RulesEngine<AssetRuleset> rulesEngine = assetEngines.get(ruleset.getAssetId());
+ if (rulesEngine == null) {
return;
}
- if (assetRulesEngine.removeRuleset(ruleset)) {
+ if (rulesEngine.removeRuleset(ruleset)) {
+ rulesEngine.stop();
assetEngines.remove(ruleset.getAssetId());
}
});
@@ -754,7 +778,7 @@ public class RulesService extends RouteBuilder implements ContainerService, Asse
List<Asset> assets = assetStorageService.findAll(
new AssetQuery()
.attributeMeta(
- new AttributeMetaPredicate(
+ new MetaPredicate(
MetaItemType.RULE_STATE,
new BooleanPredicate(true))
));
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
index cf3b2343b..9adff7743 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetDeployment.java
@@ -35,19 +35,19 @@ import org.openremote.container.Container;
import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.concurrent.ManagerExecutorService;
-import org.openremote.manager.rules.facade.AssetsFacade;
import org.openremote.manager.rules.facade.NotificationsFacade;
+import org.openremote.model.calendar.CalendarEvent;
import org.openremote.model.rules.Assets;
import org.openremote.model.rules.Ruleset;
import org.openremote.model.rules.RulesetStatus;
import org.openremote.model.rules.Users;
import org.openremote.model.rules.json.JsonRulesetDefinition;
+import org.openremote.model.util.Pair;
import javax.script.*;
-import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture;
@@ -55,7 +55,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import static org.openremote.container.concurrent.GlobalLock.withLock;
-import static org.openremote.manager.rules.JsonRulesBuilder.executeRuleActions;
+import static org.openremote.manager.rules.AssetQueryPredicate.getNextOrActiveFromTo;
public class RulesetDeployment {
@@ -132,10 +132,11 @@ public class RulesetDeployment {
final protected Users usersFacade;
final protected NotificationsFacade notificationsFacade;
final protected List<ScheduledFuture> scheduledRuleActions = new ArrayList<>();
- protected RulesetStatus status;
+ protected RulesetStatus status = RulesetStatus.READY;
protected Throwable error;
protected JsonRulesBuilder jsonRulesBuilder;
- protected JsonRulesetDefinition jsonRulesetDefinition;
+ protected CalendarEvent validity;
+ protected Pair<Long, Long> nextValidity;
public RulesetDeployment(Ruleset ruleset, TimerService timerService, AssetStorageService assetStorageService, ManagerExecutorService executorService, Assets assetsFacade, Users usersFacade, NotificationsFacade notificationsFacade) {
this.ruleset = ruleset;
@@ -146,16 +147,11 @@ public class RulesetDeployment {
this.usersFacade = usersFacade;
this.notificationsFacade = notificationsFacade;
- if (ruleset.getLang() == Ruleset.Lang.JSON) {
- try {
- String rulesStr = ruleset.getRules();
- rulesStr = rulesStr.replace("%RULESET_ID%", Long.toString(ruleset.getId()));
- rulesStr = rulesStr.replace("%RULESET_NAME%", ruleset.getName());
- jsonRulesetDefinition = Container.JSON.readValue(rulesStr, JsonRulesetDefinition.class);
- jsonRulesBuilder = new JsonRulesBuilder(timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, this::scheduleRuleAction);
- } catch (IOException e) {
- RulesEngine.LOG.log(Level.SEVERE, "Error evaluating ruleset: " + ruleset, e);
- setError(e);
+ if (ruleset.hasMeta(Ruleset.META_KEY_VALIDITY)) {
+ validity = ruleset.getValidity();
+
+ if (validity == null) {
+ RulesEngine.LOG.log(Level.SEVERE, "Ruleset has invalid validity value '" + ruleset.getMeta(Ruleset.META_KEY_VALIDITY) + "'");
}
}
}
@@ -180,36 +176,52 @@ public class RulesetDeployment {
return rules;
}
- /**
- * Called when a ruleset is about to be started (allows for initialisation tasks)
- */
- public void onStart(RulesFacts facts) {
- if (jsonRulesetDefinition != null && jsonRulesetDefinition.rules != null && jsonRulesetDefinition.rules.length > 0) {
- Arrays.stream(jsonRulesetDefinition.rules).forEach(jsonRule ->
- executeRuleActions(jsonRule, jsonRule.onStart, "onStart", false, facts, null, assetsFacade, usersFacade, notificationsFacade, timerService, assetStorageService, this::scheduleRuleAction));
+ public void updateValidity() {
+ if (validity != null && !hasExpired()) {
+ Pair<Long, Long> fromTo = getNextOrActiveFromTo(validity, new Date(timerService.getCurrentTimeMillis()));
+ if (fromTo == null) {
+ nextValidity = new Pair<>(Long.MIN_VALUE, Long.MIN_VALUE);
+ } else {
+ nextValidity = fromTo;
+ }
}
}
- public boolean start() {
- RulesEngine.LOG.info("Evaluating ruleset deployment: " + ruleset);
+ public long getValidFrom() {
+ return nextValidity != null ? nextValidity.key : Long.MIN_VALUE;
+ }
+
+ public long getValidTo() {
+ return nextValidity != null ? nextValidity.value : Long.MAX_VALUE;
+ }
+
+ public boolean hasExpired() {
+ return validity != null && nextValidity != null && nextValidity.value == Long.MIN_VALUE;
+ }
+
+ public boolean compile() {
+ RulesEngine.LOG.info("Compiling ruleset deployment: " + ruleset);
+ if (error != null) {
+ return false;
+ }
+
switch (ruleset.getLang()) {
case JAVASCRIPT:
- return startRulesJavascript(ruleset, assetsFacade, usersFacade, notificationsFacade);
+ return compileRulesJavascript(ruleset, assetsFacade, usersFacade, notificationsFacade);
case GROOVY:
- return startRulesGroovy(ruleset, assetsFacade, usersFacade, notificationsFacade);
+ return compileRulesGroovy(ruleset, assetsFacade, usersFacade, notificationsFacade);
case JSON:
- return startRulesJson(ruleset);
+ return compileRulesJson(ruleset);
}
return false;
}
/**
- * Called when a ruleset is about to be stopped (allows for cleanup tasks)
+ * Called when a ruleset is started (allows for initialisation tasks)
*/
- public void onStop(RulesFacts facts) {
- if (jsonRulesetDefinition != null && jsonRulesetDefinition.rules != null && jsonRulesetDefinition.rules.length > 0) {
- Arrays.stream(jsonRulesetDefinition.rules).forEach(jsonRule ->
- executeRuleActions(jsonRule, jsonRule.onStop, "onStop", false, facts, null, assetsFacade, usersFacade, notificationsFacade, timerService, assetStorageService, this::scheduleRuleAction));
+ public void start(RulesFacts facts) {
+ if (jsonRulesBuilder != null) {
+ jsonRulesBuilder.start(facts);
}
}
@@ -217,12 +229,15 @@ public class RulesetDeployment {
* Called when this deployment is stopped, could be the ruleset is being updated, removed or an error has occurred
* during execution
*/
- public void stop() {
- withLock(toString() + "::stopRulesetDeployment", () ->
- scheduledRuleActions.removeIf(scheduledFuture -> {
- scheduledFuture.cancel(true);
- return true;
- }));
+ public void stop(RulesFacts facts) {
+ scheduledRuleActions.removeIf(scheduledFuture -> {
+ scheduledFuture.cancel(true);
+ return true;
+ });
+
+ if (jsonRulesBuilder != null) {
+ jsonRulesBuilder.stop(facts);
+ }
}
public void onAssetStatesChanged(RulesFacts facts) {
@@ -242,30 +257,35 @@ public class RulesetDeployment {
});
}
- protected boolean startRulesJson(Ruleset ruleset) {
-
- if (jsonRulesetDefinition == null || jsonRulesetDefinition.rules == null || jsonRulesetDefinition.rules.length == 0) {
- RulesEngine.LOG.log(Level.WARNING, "No rules within ruleset so nothing to start: " + ruleset);
- return false;
- }
+ protected boolean compileRulesJson(Ruleset ruleset) {
try {
- Arrays.stream(jsonRulesetDefinition.rules).forEach(r -> jsonRulesBuilder.add(r));
+ String rulesStr = ruleset.getRules();
+ rulesStr = rulesStr.replace("%RULESET_ID%", Long.toString(ruleset.getId()));
+ rulesStr = rulesStr.replace("%RULESET_NAME%", ruleset.getName());
+
+ JsonRulesetDefinition jsonRulesetDefinition = Container.JSON.readValue(rulesStr, JsonRulesetDefinition.class);
+
+ if (jsonRulesetDefinition == null || jsonRulesetDefinition.rules == null || jsonRulesetDefinition.rules.length == 0) {
+ throw new IllegalArgumentException("No rules within ruleset so nothing to start: " + ruleset);
+ }
+
+ jsonRulesBuilder = new JsonRulesBuilder(jsonRulesetDefinition.rules, timerService, assetStorageService, executorService, assetsFacade, usersFacade, notificationsFacade, this::scheduleRuleAction);
+
+ for (Rule rule : jsonRulesBuilder.build()) {
+ RulesEngine.LOG.fine("Registering JSON rule: " + rule.getName());
+ rules.register(rule);
+ }
+
+ return true;
} catch (Exception e) {
- RulesEngine.LOG.log(Level.SEVERE, "Exception occurred during ruleset deployment: " + ruleset);
+ setError(e);
return false;
}
- for (Rule rule : jsonRulesBuilder.build()) {
- RulesEngine.LOG.info("Registering JSON rule: " + rule.getName());
- rules.register(rule);
- }
- RulesEngine.LOG.info("Evaluated ruleset deployment: " + ruleset);
-
- return true;
}
- protected boolean startRulesJavascript(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade consolesFacade) {
+ protected boolean compileRulesJavascript(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade consolesFacade) {
// TODO https://github.com/pfisterer/scripting-sandbox/blob/master/src/main/java/de/farberg/scripting/sandbox/ScriptingSandbox.java
ScriptEngine scriptEngine = scriptEngineManager.getEngineByName("nashorn");
ScriptContext newContext = new SimpleScriptContext();
@@ -327,13 +347,10 @@ public class RulesetDeployment {
try {
scriptEngine.eval(script, engineScope);
- startRulesJavascript((ScriptObjectMirror) engineScope.get("rules"));
-
- RulesEngine.LOG.info("Evaluated ruleset deployment: " + ruleset);
+ compileRulesJavascript((ScriptObjectMirror) engineScope.get("rules"));
return true;
} catch (Exception e) {
- RulesEngine.LOG.log(Level.SEVERE, "Error evaluating ruleset: " + ruleset, e);
setError(e);
engineScope.clear();
return false;
@@ -343,7 +360,7 @@ public class RulesetDeployment {
/**
* Marshal the JavaScript rules array into {@link Rule} instances.
*/
- protected void startRulesJavascript(ScriptObjectMirror scriptRules) {
+ protected void compileRulesJavascript(ScriptObjectMirror scriptRules) {
if (scriptRules == null || !scriptRules.isArray()) {
throw new IllegalArgumentException("No 'rules' array defined in ruleset");
}
@@ -401,7 +418,7 @@ public class RulesetDeployment {
throw new IllegalArgumentException("Defined 'then' is not a function in rule: " + name);
}
- RulesEngine.LOG.info("Registering rule: " + name);
+ RulesEngine.LOG.fine("Registering javascript rule: " + name);
rules.register(
new RuleBuilder().name(name).description(description).priority(priority).when(when).then(then).build()
@@ -409,7 +426,7 @@ public class RulesetDeployment {
}
}
- protected boolean startRulesGroovy(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade notificationFacade) {
+ protected boolean compileRulesGroovy(Ruleset ruleset, Assets assetsFacade, Users usersFacade, NotificationsFacade notificationFacade) {
try {
// TODO Implement sandbox
// new DenyAll().register();
@@ -424,14 +441,13 @@ public class RulesetDeployment {
script.setBinding(binding);
script.run();
for (Rule rule : rulesBuilder.build()) {
- RulesEngine.LOG.info("Registering rule: " + rule.getName());
+ RulesEngine.LOG.fine("Registering groovy rule: " + rule.getName());
rules.register(rule);
}
- RulesEngine.LOG.info("Evaluated ruleset deployment: " + ruleset);
+
return true;
} catch (Exception e) {
- RulesEngine.LOG.log(Level.SEVERE, "Error evaluating ruleset: " + ruleset, e);
setError(e);
return false;
}
@@ -457,6 +473,14 @@ public class RulesetDeployment {
return getError() != null ? getError().getMessage() : null;
}
+ public boolean isError() {
+ return getStatus() == RulesetStatus.LOOP_ERROR || ((getStatus() == RulesetStatus.EXECUTION_ERROR || getStatus() == RulesetStatus.COMPILATION_ERROR) && !isContinueOnError());
+ }
+
+ public boolean isContinueOnError() {
+ return ruleset.isContinueOnError();
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
index 6362d6786..14798087e 100644
--- a/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
+++ b/manager/src/main/java/org/openremote/manager/rules/RulesetStorageService.java
@@ -19,6 +19,8 @@
*/
package org.openremote.manager.rules;
+import org.hibernate.Session;
+import org.hibernate.jdbc.AbstractReturningWork;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
import org.openremote.container.persistence.PersistenceService;
@@ -26,17 +28,41 @@ import org.openremote.container.timer.TimerService;
import org.openremote.manager.asset.AssetStorageService;
import org.openremote.manager.security.ManagerIdentityService;
import org.openremote.manager.web.ManagerWebService;
+import org.openremote.model.query.RulesetQuery;
import org.openremote.model.rules.AssetRuleset;
import org.openremote.model.rules.GlobalRuleset;
import org.openremote.model.rules.Ruleset;
import org.openremote.model.rules.TenantRuleset;
-import org.openremote.model.util.TextUtil;
-
-import javax.persistence.TypedQuery;
+import org.openremote.model.value.ObjectValue;
+import org.openremote.model.value.Values;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
+import java.util.function.Consumer;
+import java.util.logging.Logger;
public class RulesetStorageService implements ContainerService {
+ protected interface ParameterBinder extends Consumer<PreparedStatement> {
+
+ @Override
+ default void accept(PreparedStatement st) {
+ try {
+ acceptStatement(st);
+ } catch (SQLException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ void acceptStatement(PreparedStatement st) throws SQLException;
+ }
+
+ private static final Logger LOG = Logger.getLogger(RulesetStorageService.class.getName());
+
protected PersistenceService persistenceService;
protected ManagerIdentityService identityService;
@@ -70,185 +96,198 @@ public class RulesetStorageService implements ContainerService {
}
- public List<GlobalRuleset> findGlobalRulesets(boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
-
- String query = "select new org.openremote.model.rules.GlobalRuleset(" +
- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.enabled, rs.name, rs.lang, rs.meta, rs.continueOnError";
-
- query += fullyPopulate ? ", rs.rules" : ", cast(null as string)";
-
- query += ") " +
- "from GlobalRuleset rs where 1=1 ";
+ public <T extends Ruleset> T find(Class<T> rulesetType, Long id) {
+ return find(rulesetType, id, true);
+ }
- if (onlyEnabled) {
- query += "and rs.enabled = true ";
- }
+ public <T extends Ruleset> T find(Class<T> rulesetType, Long id, boolean loadComplete) {
+ if (id == null)
+ throw new IllegalArgumentException("Can't query null ruleset identifier");
+ return find(rulesetType, new RulesetQuery()
+ .setFullyPopulate(loadComplete)
+ .setIds(id));
+ }
- if (language != null) {
- query += "and rs.lang = :lang ";
+ public <T extends Ruleset> T find(Class<T> rulesetType, RulesetQuery query) {
+ List<T> result = findAll(rulesetType, query);
+ if (result.isEmpty())
+ return null;
+ if (result.size() > 1) {
+ throw new IllegalArgumentException("Query returned more than one ruleset");
}
+ return result.get(0);
+ }
- query += "order by rs.createdOn asc";
-
- String finalQuery = query;
- return persistenceService.doReturningTransaction(entityManager -> {
- TypedQuery<GlobalRuleset> qry = entityManager.createQuery(
- finalQuery,
- GlobalRuleset.class
- );
-
- if (language != null) {
- qry.setParameter("lang", language);
+ public <T extends Ruleset> List<T> findAll(Class<T> rulesetType, RulesetQuery query) {
+ return persistenceService.doReturningTransaction(em -> {
+ LOG.fine("Building: " + query);
+ StringBuilder sb = new StringBuilder();
+ List<ParameterBinder> binders = new ArrayList<>();
+ appendSelectString(sb, rulesetType, query);
+ appendFromString(sb, rulesetType, query);
+ appendWhereString(sb, rulesetType, query, binders);
+ appendOrder(sb, query);
+ appendLimit(sb, query);
+
+ String sqlQuery = sb.toString();
+
+ return em.unwrap(Session.class).doReturningWork(new AbstractReturningWork<List<T>>() {
+ @Override
+ public List<T> execute(Connection connection) throws SQLException {
+ LOG.fine("Executing: " + sqlQuery);
+ try (PreparedStatement st = connection.prepareStatement(sqlQuery)) {
+ binders.forEach(parameterBinder -> parameterBinder.accept(st));
+
+ try (ResultSet rs = st.executeQuery()) {
+ List<T> result = new ArrayList<>();
+ while (rs.next()) {
+ result.add(mapResultTuple(rulesetType, query, rs));
+ }
+ return result;
+ }
+ }
}
-
- return qry.getResultList();
+ });
});
}
- public List<TenantRuleset> findTenantRulesets(boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
- return findTenantRulesets(null, onlyPublic, onlyEnabled, language, fullyPopulate);
+ public <T extends Ruleset> T merge(T ruleset) {
+ return persistenceService.doReturningTransaction(entityManager ->
+ entityManager.merge(ruleset)
+ );
}
- public List<TenantRuleset> findTenantRulesets(String realm, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
-
- String query = "select new org.openremote.model.rules.TenantRuleset(" +
- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.enabled, rs.name, rs.lang, rs.meta";
-
- query += fullyPopulate ? ", rs.rules" : ", cast(null as string)";
-
- query += ", rs.realm, rs.accessPublicRead, rs.continueOnError) " +
- "from TenantRuleset rs " +
- "where 1=1 ";
-
- boolean includeRealm = !TextUtil.isNullOrEmpty(realm);
- if (includeRealm) {
- query += "and rs.realm = :realm ";
- }
+ public <T extends Ruleset> void delete(Class<T> rulesetType, Long id) {
+ persistenceService.doTransaction(entityManager -> {
+ Ruleset ruleset = entityManager.find(rulesetType, id);
+ if (ruleset != null)
+ entityManager.remove(ruleset);
+ });
+ }
- if (onlyPublic) {
- query += "and rs.accessPublicRead = true ";
- }
+ protected <T extends Ruleset> void appendSelectString(StringBuilder sb, Class<T> rulesetType, RulesetQuery query) {
+ sb.append("SELECT R.ID, R.OBJ_VERSION, R.RULES_LANG, R.ENABLED, R.LAST_MODIFIED, R.CREATED_ON, R.NAME, R.META");
- if (onlyEnabled) {
- query += "and rs.enabled = true ";
+ if (query.fullyPopulate) {
+ sb.append(", R.RULES");
}
- if (language != null) {
- query += "and rs.lang = :lang ";
+ if (rulesetType == TenantRuleset.class) {
+ sb.append(", R.ACCESS_PUBLIC_READ, R.REALM");
+ } else if (rulesetType == AssetRuleset.class) {
+ sb.append(", R.ACCESS_PUBLIC_READ, R.ASSET_ID, A.REALM AS REALM");
}
-
- query += "order by rs.createdOn asc";
-
- String finalQuery = query;
- return persistenceService.doReturningTransaction(entityManager -> {
- TypedQuery<TenantRuleset> qry = entityManager.createQuery(
- finalQuery,
- TenantRuleset.class
- );
- if (includeRealm) {
- qry.setParameter("realm", realm);
- }
- if (language != null) {
- qry.setParameter("lang", language);
- }
-
- return qry.getResultList();
- }
- );
}
- public List<AssetRuleset> findAssetRulesetsByRealm(String realm, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
- return findAssetRulesets(realm, null, onlyPublic, onlyEnabled, language, fullyPopulate);
- }
- public List<AssetRuleset> findAssetRulesetsByAssetId(String assetId, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
- return findAssetRulesets(null, assetId, onlyPublic, onlyEnabled, language, fullyPopulate);
+ protected <T extends Ruleset> void appendFromString(StringBuilder sb, Class<T> rulesetType, RulesetQuery query) {
+ if (rulesetType == GlobalRuleset.class) {
+ sb.append(" FROM GLOBAL_RULESET R");
+ }else if (rulesetType == TenantRuleset.class) {
+ sb.append(" FROM TENANT_RULESET R");
+ } else if (rulesetType == AssetRuleset.class) {
+ sb.append(" FROM ASSET_RULESET R JOIN ASSET A ON (R.ASSET_ID = A.ID)");
+ } else {
+ throw new UnsupportedOperationException("Ruleset type not supported: " + rulesetType);
+ }
}
- public List<AssetRuleset> findAssetRulesets(String realm, String assetId, boolean onlyPublic, boolean onlyEnabled, Ruleset.Lang language, boolean fullyPopulate) {
-
- String query = "select new org.openremote.model.rules.AssetRuleset(" +
- "rs.id, rs.version, rs.createdOn, rs.lastModified, rs.enabled, rs.name, rs.lang, rs.meta";
- query += fullyPopulate ? ", rs.rules" : ", cast(null as string)";
+ protected <T extends Ruleset> void appendWhereString(StringBuilder sb, Class<T> rulesetType, RulesetQuery query, List<ParameterBinder> binders) {
+ sb.append(" WHERE 1=1");
- query += ", a.realm, rs.assetId, rs.accessPublicRead, rs.continueOnError) " +
- "from AssetRuleset rs, Asset a " +
- "where rs.assetId = a.id ";
-
- boolean includeRealm = !TextUtil.isNullOrEmpty(realm);
- boolean includeAssetId = !TextUtil.isNullOrEmpty(assetId);
-
- if (includeRealm) {
- query += "and a.realm = :realm ";
+ if (query.publicOnly) {
+ sb.append(" AND R.ACCESS_PUBLIC_READ");
}
-
- if (includeAssetId) {
- query += "and rs.assetId = :assetId ";
+ if (query.enabledOnly) {
+ sb.append(" AND R.ENABLED");
}
-
- if (onlyPublic) {
- query += "and rs.accessPublicRead = true ";
+ if (query.language != null) {
+ sb.append(" AND R.RULES_LANG = ?");
+ final int pos = binders.size() + 1;
+ binders.add(st -> st.setString(pos, query.language.toString()));
}
-
- if (onlyEnabled) {
- query += "and rs.enabled = true ";
+ if (query.ids != null && query.ids.length > 0) {
+ sb.append(" AND R.ID IN (?");
+ final int pos = binders.size() + 1;
+ binders.add(st -> st.setLong(pos, query.ids[0]));
+
+ for (int i = 1; i < query.ids.length; i++) {
+ sb.append(",?");
+ final int pos2 = binders.size() + 1;
+ final int index = i;
+ binders.add(st -> st.setLong(pos2, query.ids[index]));
+ }
+ sb.append(")");
}
- if (language != null) {
- query += "and rs.lang = :lang ";
+ if (query.meta != null) {
+ // TODO: Add meta filtering support
}
- query += "order by rs.createdOn asc";
-
- String finalQuery = query;
-
- return persistenceService.doReturningTransaction(entityManager -> {
- TypedQuery<AssetRuleset> qry = entityManager.createQuery(
- finalQuery,
- AssetRuleset.class
- );
-
- if (includeRealm) {
- qry.setParameter("realm", realm);
- }
- if (includeAssetId) {
- qry.setParameter("assetId", assetId);
- }
- if (language != null) {
- qry.setParameter("lang", language);
- }
-
- return qry.getResultList();
- }
- );
- }
-
- public <T extends Ruleset> T findById(Class<T> rulesetType, Long id) {
-
- return persistenceService.doReturningTransaction(em -> {
- T ruleset = em.find(rulesetType, id);
-
- if (rulesetType == AssetRuleset.class && ruleset != null && TextUtil.isNullOrEmpty(((AssetRuleset)ruleset).getRealm())) {
- // Asset rulesets require special treatment as realm is transient - TODO Should a JPA mapping be used?
- String realm = em.createQuery("select a.realm from AssetRuleset rs, Asset a where a.id = rs.assetId and rs.id = :id", String.class).setParameter("id", id).getSingleResult();
- ((AssetRuleset) ruleset).setRealm(realm);
+ if (query.realm != null && (rulesetType == TenantRuleset.class || rulesetType == AssetRuleset.class)) {
+ sb.append(" AND REALM = ?");
+ final int pos = binders.size() + 1;
+ binders.add(st -> st.setString(pos, query.realm));
+ }
+ if (query.assetIds != null && query.assetIds.length > 0 && rulesetType == AssetRuleset.class) {
+ sb.append(" AND R.ASSET_ID IN (?");
+ final int pos = binders.size() + 1;
+ binders.add(st -> st.setString(pos, query.assetIds[0]));
+
+ for (int i = 1; i < query.assetIds.length; i++) {
+ sb.append(",?");
+ final int pos2 = binders.size() + 1;
+ final int index = i;
+ binders.add(st -> st.setString(pos2, query.assetIds[index]));
}
+ sb.append(")");
+ }
+ }
- return ruleset;
- });
+ protected void appendOrder(StringBuilder sb, RulesetQuery query) {
+ sb.append(" ORDER BY CREATED_ON ASC");
}
- public <T extends Ruleset> T merge(T ruleset) {
- return persistenceService.doReturningTransaction(entityManager ->
- entityManager.merge(ruleset)
- );
+ protected void appendLimit(StringBuilder sb, RulesetQuery query) {
+ if (query.limit > 0) {
+ sb.append(" LIMIT " + query.limit);
+ }
}
- public <T extends Ruleset> void delete(Class<T> rulesetType, Long id) {
- persistenceService.doTransaction(entityManager -> {
- Ruleset ruleset = entityManager.find(rulesetType, id);
- if (ruleset != null)
- entityManager.remove(ruleset);
- });
+ protected <T extends Ruleset> T mapResultTuple(Class<T> rulesetType, RulesetQuery query, ResultSet rs) throws SQLException {
+ T ruleset;
+
+ if (rulesetType == GlobalRuleset.class) {
+ ruleset = (T) new GlobalRuleset();
+ } else if (rulesetType == TenantRuleset.class) {
+ TenantRuleset tenantRuleset = new TenantRuleset();
+ tenantRuleset.setRealm(rs.getString("REALM"));
+ tenantRuleset.setAccessPublicRead(rs.getBoolean("ACCESS_PUBLIC_READ"));
+ ruleset = (T)tenantRuleset;
+ } else if (rulesetType == AssetRuleset.class) {
+ AssetRuleset assetRuleset = new AssetRuleset();
+ assetRuleset.setAssetId(rs.getString("ASSET_ID"));
+ assetRuleset.setRealm(rs.getString("REALM"));
+ assetRuleset.setAccessPublicRead(rs.getBoolean("ACCESS_PUBLIC_READ"));
+ ruleset = (T)assetRuleset;
+ } else {
+ throw new UnsupportedOperationException("Ruleset type not supported: " + rulesetType);
+ }
+
+ ruleset.setName(rs.getString("NAME"));
+ ruleset.setId(rs.getLong("ID"));
+ ruleset.setVersion(rs.getLong("OBJ_VERSION"));
+ ruleset.setLang(Ruleset.Lang.valueOf(rs.getString("RULES_LANG")));
+ ruleset.setEnabled(rs.getBoolean("ENABLED"));
+ ruleset.setLastModified(rs.getTimestamp("LAST_MODIFIED"));
+ ruleset.setCreatedOn(rs.getTimestamp("CREATED_ON"));
+ if (rs.getString("META") != null) {
+ ruleset.setMeta(Values.instance().<ObjectValue>parse(rs.getString("META")).orElse(null));
+ }
+ if (query.fullyPopulate) {
+ ruleset.setRules(rs.getString("RULES"));
+ }
+
+ return ruleset;
}
@Override
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 aece4193a..6d6f2bc87 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
@@ -874,10 +874,7 @@ public class ManagerDemoSetup extends AbstractManagerSetup {
camera3Asset = assetStorageService.merge(camera3Asset);
AssetRuleset camera3Rules = new AssetRuleset(
- "Camera3_Rules",
- GROOVY, IOUtils.toString(getClass().getResource("/demo/rules/DemoSmartCityCamera.groovy"), "UTF-8"), camera3Asset.getId(),
- false,
- false
+ camera3Asset.getId(), "Camera3_Rules", GROOVY, IOUtils.toString(getClass().getResource("/demo/rules/DemoSmartCityCamera.groovy"), "UTF-8")
);
camera3Rules = rulesetStorageService.merge(camera3Rules);
diff --git a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java
index 581801d82..c06a17cc7 100644
--- a/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java
+++ b/manager/src/main/java/org/openremote/manager/setup/builtin/RulesDemoSetup.java
@@ -55,35 +55,35 @@ public class RulesDemoSetup extends AbstractManagerSetup {
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidencePresenceDetection.groovy")) {
String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));
Ruleset ruleset = new AssetRuleset(
- "Demo Residence - Presence Detection with motion and CO2 sensors", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false
+ managerDemoSetup.apartment1Id, "Demo Residence - Presence Detection with motion and CO2 sensors", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceVacationMode.groovy")) {
String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));
Ruleset ruleset = new AssetRuleset(
- "Demo Residence - Vacation Mode", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false
+ managerDemoSetup.apartment1Id, "Demo Residence - Vacation Mode", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceAutoVentilation.groovy")) {
String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));
Ruleset ruleset = new AssetRuleset(
- "Demo Residence - Auto Ventilation", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false
+ managerDemoSetup.apartment1Id, "Demo Residence - Auto Ventilation", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy")) {
String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));
Ruleset ruleset = new AssetRuleset(
- "Demo Residence - Notify Alarm Trigger", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false
+ managerDemoSetup.apartment1Id, "Demo Residence - Notify Alarm Trigger", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceSmartSwitch.groovy")) {
String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));
Ruleset ruleset = new AssetRuleset(
- "Demo Residence - Smart Start Switch", Ruleset.Lang.GROOVY, rules, managerDemoSetup.apartment1Id, false, false
+ managerDemoSetup.apartment1Id, "Demo Residence - Smart Start Switch", Ruleset.Lang.GROOVY, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
@@ -92,7 +92,7 @@ public class RulesDemoSetup extends AbstractManagerSetup {
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoResidenceAllLightsOff.js")) {
String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));
Ruleset ruleset = new AssetRuleset(
- "Demo Residence - All Lights Off", Ruleset.Lang.JAVASCRIPT, rules, managerDemoSetup.apartment2Id, false, false
+ managerDemoSetup.apartment2Id, "Demo Residence - All Lights Off", Ruleset.Lang.JAVASCRIPT, rules
);
apartmentActionsRulesetId = rulesetStorageService.merge(ruleset).getId();
}
@@ -100,8 +100,8 @@ public class RulesDemoSetup extends AbstractManagerSetup {
try (InputStream inputStream = RulesDemoSetup.class.getResourceAsStream("/demo/rules/DemoConsoleLocation.groovy")) {
String rules = IOUtils.toString(inputStream, Charset.forName("utf-8"));
Ruleset ruleset = new TenantRuleset(
- "Demo Console Location", Ruleset.Lang.GROOVY, rules, keycloakDemoSetup.tenantA.getRealm(), true, false
- );
+ keycloakDemoSetup.tenantA.getRealm(), "Demo Console Location", Ruleset.Lang.GROOVY, rules
+ ).setAccessPublicRead(true);
tenantARulesetId = rulesetStorageService.merge(ruleset).getId();
}
}
diff --git a/manager/src/main/resources/org/openremote/manager/setup/database/V20190806_06__AddRulesetContinueOnError.sql b/manager/src/main/resources/org/openremote/manager/setup/database/V20190806_06__AddRulesetContinueOnError.sql
deleted file mode 100644
index 9c6d354ea..000000000
--- a/manager/src/main/resources/org/openremote/manager/setup/database/V20190806_06__AddRulesetContinueOnError.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Adds continueOnError column to rulesets
- */
-
--- UPDATE GLOBAL_RULESET
-ALTER TABLE GLOBAL_RULESET
- ADD COLUMN CONTINUE_ON_ERROR BOOLEAN NOT NULL DEFAULT false;
-
--- UPDATE ASSET_RULESET
-ALTER TABLE ASSET_RULESET
- ADD COLUMN CONTINUE_ON_ERROR BOOLEAN NOT NULL DEFAULT false;
-
--- UPDATE TENANT_RULESET
-ALTER TABLE TENANT_RULESET
- ADD COLUMN CONTINUE_ON_ERROR BOOLEAN NOT NULL DEFAULT false;
\ No newline at end of file
diff --git a/model/src/main/java/org/openremote/model/asset/CalendarEventConfiguration.java b/model/src/main/java/org/openremote/model/asset/CalendarEventConfiguration.java
deleted file mode 100644
index 0753f07f2..000000000
--- a/model/src/main/java/org/openremote/model/asset/CalendarEventConfiguration.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2017, OpenRemote Inc.
- *
- * See the CONTRIBUTORS.txt file in the distribution for a
- * full listing of individual contributors.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.openremote.model.asset;
-
-import org.openremote.model.AbstractValueHolder;
-import org.openremote.model.attribute.Attribute;
-import org.openremote.model.attribute.AttributeValueType;
-import org.openremote.model.calendar.CalendarEvent;
-import org.openremote.model.value.ObjectValue;
-import org.openremote.model.value.Value;
-
-import java.util.Optional;
-
-/**
- * An {@link Attribute} that can be added to an {@link Asset} to indicate that the asset is time sensitive. This is to
- * be used for informational purposes to; for example, allow console apps to only show Assets that are 'active' at a
- * particular time.
- * <p>
- * The attribute name must exactly match {@value CALENDAR_EVENT_ATTRIBUTE_NAME} and its value should be an
- * {@link ObjectValue} that represents a {@link CalendarEvent}.
- */
-public final class CalendarEventConfiguration {
-
- public static final String CALENDAR_EVENT_ATTRIBUTE_NAME = "urnOpenremoteCalendarEvent";
-
- private CalendarEventConfiguration() {
- }
-
- public static boolean isCalendarEventConfiguration(AssetAttribute attribute) {
- return attribute != null
- && attribute.getName().map(CALENDAR_EVENT_ATTRIBUTE_NAME::equals).orElse(false);
- }
-
- public static Optional<CalendarEvent> getCalendarEvent(Asset asset) {
- if (asset == null) {
- return Optional.empty();
- }
-
- return asset.getAttribute(CALENDAR_EVENT_ATTRIBUTE_NAME)
- .flatMap(AbstractValueHolder::getValue)
- .flatMap(CalendarEventConfiguration::getCalendarEvent);
- }
-
- public static Optional<CalendarEvent> getCalendarEvent(AssetAttribute attribute) {
- if (!isCalendarEventConfiguration(attribute)) {
- return Optional.empty();
- }
-
- return attribute.getValue().flatMap(CalendarEventConfiguration::getCalendarEvent);
- }
-
-
- public static Optional<CalendarEvent> getCalendarEvent(Value value) {
- if (value == null) {
- return Optional.empty();
- }
-
- return CalendarEvent.fromValue(value);
- }
-
- public static AssetAttribute toAttribute(CalendarEvent calendarEvent) {
- return new AssetAttribute(CALENDAR_EVENT_ATTRIBUTE_NAME, AttributeValueType.OBJECT, calendarEvent.toValue());
- }
-}
diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java b/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java
index b47fbf252..0fe2e6350 100644
--- a/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java
+++ b/model/src/main/java/org/openremote/model/attribute/AttributeValueType.java
@@ -204,7 +204,10 @@ public enum AttributeValueType implements AttributeValueDescriptor {
// TODO Implement "Saved Filter/Searches" properly, see AssetResourceImpl
RULES_TEMPLATE_FILTER("filter", ValueType.ARRAY),
- ASSET_STATUS("heart-pulse", ValueType.STRING);
+ ASSET_STATUS("heart-pulse", ValueType.STRING),
+
+
+ CALENDAR_EVENT("calendar", ValueType.OBJECT);
public enum AttributeValueTypeFailureReason implements ValidationFailure.Reason {
diff --git a/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java b/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java
index 9bf07c7b4..a88f43429 100644
--- a/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java
+++ b/model/src/main/java/org/openremote/model/calendar/CalendarEvent.java
@@ -19,6 +19,8 @@
*/
package org.openremote.model.calendar;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openremote.model.asset.Asset;
import org.openremote.model.value.ObjectValue;
import org.openremote.model.value.Value;
import org.openremote.model.value.ValueType;
@@ -28,25 +30,32 @@ import java.util.Date;
import java.util.Optional;
/**
- * Represents an event that occurs at a point in time with a duration and optional recurrence. This is inspired by the
- * following standards:
+ * Represents an event that occurs at a point in time with a {@link #start}, {#link #end} and optional
+ * {@link #recurrence} and loosely follows the following standard for JSEvent. If {@link #end} is not specified then it
+ * is assumed the event never ends and so only the {@link #start} is important.
+ * <p>
+ * CRON expressions were ruled out because intervals are not possible when using days
+ * of the week (e.g. every other Thursday).
+ * <p>
+ * Note that unix timestamp milliseconds is used everywhere as time zone information can
+ * be obtained from the associated {@link Asset}; {@link #start} and {@link #end} are required but {@link #recurrence}
+ * is optional:
* <ul>
- * <li><a href="https://icalendar.org/RFC-Specifications/iCalendar-RFC-5545/">iCalendar RFC-5545</a></li>
* <li><a href="https://tools.ietf.org/id/draft-jenkins-jscalendar-01.html">JSCalendar</a></li>
* </ul>
* <p>
- * Example 1:
+ * Example 1 (One day, one time only):
* <blockquote><pre>{@code
{
- "start": 1517011200,
- "end": 1517014800
+ "start": 1441148400000,
+ "end": 1441234800000
}
* }</pre></blockquote>
- * Example 2 (Repeat every other week, 3 occurrences):
+ * Example 2 (2 days starting 2nd September 2015; repeat every other week, 3 occurrences):
* <blockquote><pre>{@code
{
- "start": 1517011200,
- "end": 1517014800,
+ "start": 1441148400000,
+ "end": 1441321200000,
"recurrence": {
"frequency": "WEEKLY",
"interval": 2,
@@ -54,44 +63,31 @@ import java.util.Optional;
}
}
* }</pre></blockquote>
- * Example 3 (Repeat every day until 1st Feb 2018):
+ * Example 3 (8 hours starting 2nd September 2015 08:00am, repeat every day until 1st Feb 2018):
* <blockquote><pre>{@code
{
- "start": 1517011200,
- "end": 1517014800,
+ "start": 1441177200000,
+ "ends": 1441206000000,
"recurrence": {
- "frequency": "WEEKLY",
- "interval": 2,
- "until": 1517443200
+ "frequency": "DAILY",
+ "interval": 1,
+ "until": 1517443200000
}
}
* }</pre></blockquote>
- * <b>
- * <h1>NOTES</h1>
- * <ul>
- * <li>date and time values must be in Unix timestamp seconds</li>
- * </ul>
- * </b>
*/
public class CalendarEvent {
protected Date start;
protected Date end;
protected RecurrenceRule recurrence;
- protected CalendarEvent() {
- }
-
+ @JsonCreator
public CalendarEvent(Date start, Date end, RecurrenceRule recurrence) {
this.start = start;
this.end = end;
this.recurrence = recurrence;
}
- public CalendarEvent(Date start, Date end) {
- this.start = start;
- this.end = end;
- }
-
public Date getStart() {
return start;
}
@@ -114,20 +110,16 @@ public class CalendarEvent {
Optional<Long> end = objectValue.get("end").flatMap(Values::getLongCoerced);
Optional<RecurrenceRule> recurrence = RecurrenceRule.fromValue(objectValue.getObject("recurrence").orElse(null));
- if (!start.isPresent() || !end.isPresent()) {
- return Optional.empty();
- }
-
- return Optional.of(
- new CalendarEvent(new Date(1000L*start.get()),
- new Date(1000L*end.get()), recurrence.orElse(null))
- );
+ return start.map(aLong -> new CalendarEvent(new Date(aLong),
+ end.map(Date::new).orElse(null), recurrence.orElse(null)));
}
public Value toValue() {
ObjectValue objectValue = Values.createObject();
- objectValue.put("start", start.getTime() / 1000);
- objectValue.put("end", end.getTime() / 1000);
+ objectValue.put("start", start.getTime());
+ if (end != null) {
+ objectValue.put("end", end.getTime());
+ }
if (recurrence != null) {
objectValue.put("recurrence", recurrence.toValue());
}
diff --git a/model/src/main/java/org/openremote/model/calendar/RecurrenceRule.java b/model/src/main/java/org/openremote/model/calendar/RecurrenceRule.java
index 4c97c4c5d..e6ba39f4c 100644
--- a/model/src/main/java/org/openremote/model/calendar/RecurrenceRule.java
+++ b/model/src/main/java/org/openremote/model/calendar/RecurrenceRule.java
@@ -42,22 +42,10 @@ public class RecurrenceRule {
protected Integer count;
protected Date until;
- protected RecurrenceRule() {
- }
-
- public RecurrenceRule(Frequency frequency) {
- this.frequency = frequency;
- }
-
- public RecurrenceRule(Frequency frequency, int interval, int count) {
+ public RecurrenceRule(Frequency frequency, Integer interval, Integer count, Date until) {
this.frequency = frequency;
this.interval = interval;
this.count = count;
- }
-
- public RecurrenceRule(Frequency frequency, int interval, Date until) {
- this.frequency = frequency;
- this.interval = interval;
this.until = until;
}
@@ -93,10 +81,7 @@ public class RecurrenceRule {
return Optional.empty();
}
- RecurrenceRule rRule = new RecurrenceRule(frequency.get());
- rRule.interval = interval;
- rRule.count = count;
- until.ifPresent(l -> rRule.until = new Date(1000L * l));
+ RecurrenceRule rRule = new RecurrenceRule(frequency.get(), interval, count, until.map(Date::new).orElse(null));
return Optional.of(rRule);
}
@@ -110,7 +95,7 @@ public class RecurrenceRule {
objectValue.put("count", Values.create(count));
}
if (until != null) {
- objectValue.put("until", Values.create(until.getTime()/1000));
+ objectValue.put("until", Values.create(until.getTime()));
}
return objectValue;
diff --git a/model/src/main/java/org/openremote/model/query/AssetQuery.java b/model/src/main/java/org/openremote/model/query/AssetQuery.java
index e8ee0737e..8ff578f9b 100644
--- a/model/src/main/java/org/openremote/model/query/AssetQuery.java
+++ b/model/src/main/java/org/openremote/model/query/AssetQuery.java
@@ -20,7 +20,6 @@
package org.openremote.model.query;
import org.openremote.model.asset.AssetType;
-import org.openremote.model.asset.CalendarEventConfiguration;
import org.openremote.model.attribute.MetaItemDescriptor;
import org.openremote.model.query.filter.*;
@@ -254,8 +253,7 @@ public class AssetQuery {
public String[] userIds;
public StringPredicate[] types;
public LogicGroup<AttributePredicate> attributes;
- public AttributeMetaPredicate[] attributeMeta;
- public CalendarEventActivePredicate calendarEventActive;
+ public MetaPredicate[] attributeMeta;
// Ordering
public OrderBy orderBy;
public int limit;
@@ -383,7 +381,6 @@ public class AssetQuery {
return attributes(new AttributePredicate(attributeName));
}
-
public AssetQuery attributeValue(String name, ValuePredicate valuePredicate) {
return attributes(new AttributePredicate(new StringPredicate(name), valuePredicate));
}
@@ -416,7 +413,7 @@ public class AssetQuery {
return attributeValue(name, new NumberPredicate(d, operator));
}
- public AssetQuery attributeMeta(AttributeMetaPredicate... attributeMetaPredicates) {
+ public AssetQuery attributeMeta(MetaPredicate... attributeMetaPredicates) {
this.attributeMeta = attributeMetaPredicates;
return this;
}
@@ -426,21 +423,6 @@ public class AssetQuery {
return this;
}
- /**
- * Will filter out assets that have a {@link CalendarEventConfiguration} attribute that results in the event not
- * being 'active/in progress' at the specified time. Assets without a {@link CalendarEventConfiguration} attribute
- * are assumed to always be in progress (i.e. will always pass this check).
- *
- * <b>
- * NOTE: This predicate is applied in memory and the results should be limited as much as possible by applying other
- * predicates to the query to avoid performance issues.
- * </b>
- */
- public AssetQuery calendarEventActive(long timestampSeconds) {
- calendarEventActive = new CalendarEventActivePredicate(timestampSeconds);
- return this;
- }
-
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
diff --git a/model/src/main/java/org/openremote/model/query/RulesetQuery.java b/model/src/main/java/org/openremote/model/query/RulesetQuery.java
new file mode 100644
index 000000000..f5092c973
--- /dev/null
+++ b/model/src/main/java/org/openremote/model/query/RulesetQuery.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2019, OpenRemote Inc.
+ *
+ * See the CONTRIBUTORS.txt file in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.openremote.model.query;
+
+import org.openremote.model.query.filter.MetaPredicate;
+import org.openremote.model.rules.Ruleset;
+
+import java.util.Arrays;
+
+public class RulesetQuery {
+
+ public long[] ids;
+ public MetaPredicate[] meta;
+ public int limit;
+ public Ruleset.Lang language;
+ public boolean fullyPopulate;
+ public boolean publicOnly;
+ public boolean enabledOnly;
+ public String realm;
+ public String[] assetIds;
+
+ public RulesetQuery() {
+ }
+
+ public RulesetQuery setIds(long...ids) {
+ this.ids = ids;
+ return this;
+ }
+
+ public RulesetQuery setMeta(MetaPredicate...meta) {
+ this.meta = meta;
+ return this;
+ }
+
+ public RulesetQuery setLimit(int limit) {
+ this.limit = limit;
+ return this;
+ }
+
+ public RulesetQuery setLanguage(Ruleset.Lang language) {
+ this.language = language;
+ return this;
+ }
+
+ public RulesetQuery setFullyPopulate(boolean fullyPopulate) {
+ this.fullyPopulate = fullyPopulate;
+ return this;
+ }
+
+ public RulesetQuery setPublicOnly(boolean publicOnly) {
+ this.publicOnly = publicOnly;
+ return this;
+ }
+
+ public RulesetQuery setRealm(String realm) {
+ this.realm = realm;
+ return this;
+ }
+
+ public RulesetQuery setAssetIds(String...assetIds) {
+ this.assetIds = assetIds;
+ return this;
+ }
+
+ public RulesetQuery setEnabledOnly(boolean enabledOnly) {
+ this.enabledOnly = enabledOnly;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "{" +
+ "ids=" + Arrays.toString(ids) +
+ ", meta=" + Arrays.toString(meta) +
+ ", limit=" + limit +
+ ", language=" + language +
+ ", fullyPopulate=" + fullyPopulate +
+ ", publicOnly=" + publicOnly +
+ ", realm='" + realm + '\'' +
+ ", assetIds=" + Arrays.toString(assetIds) +
+ '}';
+ }
+}
diff --git a/model/src/main/java/org/openremote/model/query/UserQuery.java b/model/src/main/java/org/openremote/model/query/UserQuery.java
index e3aff36d2..74f793559 100644
--- a/model/src/main/java/org/openremote/model/query/UserQuery.java
+++ b/model/src/main/java/org/openremote/model/query/UserQuery.java
@@ -35,4 +35,14 @@ public class UserQuery {
this.limit = limit;
return this;
}
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "{" +
+ "tenantPredicate=" + tenantPredicate +
+ ", assetPredicate=" + assetPredicate +
+ ", pathPredicate=" + pathPredicate +
+ ", limit=" + limit +
+ '}';
+ }
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/AttributePredicate.java b/model/src/main/java/org/openremote/model/query/filter/AttributePredicate.java
index c7dd55dfa..3bda0ea48 100644
--- a/model/src/main/java/org/openremote/model/query/filter/AttributePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/AttributePredicate.java
@@ -26,7 +26,7 @@ import org.openremote.model.value.Values;
public class AttributePredicate {
public StringPredicate name;
- public boolean exists;
+ public boolean notExists;
public ValuePredicate value;
public AttributePredicate() {
@@ -59,6 +59,11 @@ public class AttributePredicate {
return this;
}
+ public AttributePredicate doesntExist() {
+ this.notExists = true;
+ return this;
+ }
+
public ObjectValue toModelValue() {
ObjectValue objectValue = Values.createObject();
objectValue.put("name", name.toModelValue());
diff --git a/model/src/main/java/org/openremote/model/query/filter/CalendarEventActivePredicate.java b/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java
similarity index 55%
rename from model/src/main/java/org/openremote/model/query/filter/CalendarEventActivePredicate.java
rename to model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java
index e4d986c5d..0887a9dcb 100644
--- a/model/src/main/java/org/openremote/model/query/filter/CalendarEventActivePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java
@@ -21,14 +21,30 @@ package org.openremote.model.query.filter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openremote.model.value.ObjectValue;
+import org.openremote.model.value.Values;
-public class CalendarEventActivePredicate {
+import java.util.Date;
- @JsonProperty("timestamp")
- public long timestampSeconds;
+/**
+ * Can be applied to {@link org.openremote.model.attribute.Attribute}s of type
+ * {@link org.openremote.model.attribute.AttributeValueType#CALENDAR_EVENT}.
+ */
+public class CalendarEventPredicate implements ValuePredicate {
+
+ public static final String name = "calendar-event";
+ public Date timestamp;
@JsonCreator
- public CalendarEventActivePredicate(@JsonProperty("timestamp") long timestampSeconds) {
- this.timestampSeconds = timestampSeconds;
+ public CalendarEventPredicate(@JsonProperty("timestamp") Date timestamp) {
+ this.timestamp = timestamp;
+ }
+
+ @Override
+ public ObjectValue toModelValue() {
+ ObjectValue objectValue = Values.createObject();
+ objectValue.put("predicateType", name);
+ objectValue.put("timestamp", Values.create(timestamp.getTime()));
+ return objectValue;
}
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java b/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java
index cf08f485a..bae37c2b0 100644
--- a/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/DateTimePredicate.java
@@ -24,14 +24,14 @@ import org.openremote.model.value.ObjectValue;
import org.openremote.model.value.Values;
/**
- * Predicate for date time values; provided values should be valid ISO 8601 datetime strings (e.g. yyyy-MM-dd'T'HH:mm:ssZ
- * or yyyy-MM-dd'T'HH:mm:ss\u00b1HH:mm), it is recommended to include time zone information to avoid any issues working
- * across timezones.
+ * Predicate for date time values; provided values should be valid ISO 8601 datetime strings
+ * (e.g. yyyy-MM-dd'T'HH:mm:ssZ or yyyy-MM-dd'T'HH:mm:ss\u00b1HH:mm), offset and time are optional, if no offset
+ * information is supplied then UTC is assumed.
*/
public class DateTimePredicate implements ValuePredicate {
public static final String name = "datetime";
- public String value; // Sliding window value e.g. 1h or fixed date time
+ public String value; // Sliding window value e.g. 1h or fixed date time in ISO 8601
public String rangeValue; // Sliding window value e.g. 1h or fixed date time (used as upper bound when Operator.BETWEEN)
public AssetQuery.Operator operator = AssetQuery.Operator.EQUALS;
public boolean negate;
diff --git a/model/src/main/java/org/openremote/model/query/filter/AttributeMetaPredicate.java b/model/src/main/java/org/openremote/model/query/filter/MetaPredicate.java
similarity index 71%
rename from model/src/main/java/org/openremote/model/query/filter/AttributeMetaPredicate.java
rename to model/src/main/java/org/openremote/model/query/filter/MetaPredicate.java
index 0a92d6a90..1f25906d2 100644
--- a/model/src/main/java/org/openremote/model/query/filter/AttributeMetaPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/MetaPredicate.java
@@ -20,47 +20,46 @@
package org.openremote.model.query.filter;
import org.openremote.model.attribute.MetaItemDescriptor;
-import org.openremote.model.query.AssetQuery;
-public class AttributeMetaPredicate {
+public class MetaPredicate {
public StringPredicate itemNamePredicate;
public ValuePredicate itemValuePredicate;
- public AttributeMetaPredicate() {
+ public MetaPredicate() {
}
- public AttributeMetaPredicate(StringPredicate itemNamePredicate) {
+ public MetaPredicate(StringPredicate itemNamePredicate) {
this.itemNamePredicate = itemNamePredicate;
}
- public AttributeMetaPredicate(MetaItemDescriptor metaItemDescriptor) {
+ public MetaPredicate(MetaItemDescriptor metaItemDescriptor) {
this.itemNamePredicate = new StringPredicate(metaItemDescriptor.getUrn());
}
- public AttributeMetaPredicate(ValuePredicate itemValuePredicate) {
+ public MetaPredicate(ValuePredicate itemValuePredicate) {
this.itemValuePredicate = itemValuePredicate;
}
- public AttributeMetaPredicate(StringPredicate itemNamePredicate, ValuePredicate itemValuePredicate) {
+ public MetaPredicate(StringPredicate itemNamePredicate, ValuePredicate itemValuePredicate) {
this.itemNamePredicate = itemNamePredicate;
this.itemValuePredicate = itemValuePredicate;
}
- public AttributeMetaPredicate(MetaItemDescriptor metaItemDescriptor, ValuePredicate itemValuePredicate) {
+ public MetaPredicate(MetaItemDescriptor metaItemDescriptor, ValuePredicate itemValuePredicate) {
this(new StringPredicate(metaItemDescriptor.getUrn()), itemValuePredicate);
}
- public AttributeMetaPredicate itemName(StringPredicate itemNamePredicate) {
+ public MetaPredicate itemName(StringPredicate itemNamePredicate) {
this.itemNamePredicate = itemNamePredicate;
return this;
}
- public AttributeMetaPredicate itemName(MetaItemDescriptor metaItemDescriptor) {
+ public MetaPredicate itemName(MetaItemDescriptor metaItemDescriptor) {
return itemName(new StringPredicate(metaItemDescriptor.getUrn()));
}
- public AttributeMetaPredicate itemValue(ValuePredicate itemValuePredicate) {
+ public MetaPredicate itemValue(ValuePredicate itemValuePredicate) {
this.itemValuePredicate = itemValuePredicate;
return this;
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/NewAttributePredicate.java b/model/src/main/java/org/openremote/model/query/filter/NewAttributePredicate.java
index 47ff70681..7a97e0a78 100644
--- a/model/src/main/java/org/openremote/model/query/filter/NewAttributePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/NewAttributePredicate.java
@@ -19,17 +19,12 @@
*/
package org.openremote.model.query.filter;
-import org.openremote.model.query.filter.AttributeMetaPredicate;
-import org.openremote.model.query.filter.DateTimePredicate;
-import org.openremote.model.query.filter.StringPredicate;
-import org.openremote.model.query.filter.ValuePredicate;
-
/**
* There is an implicit AND condition between each value
*/
// TODO: Introduce value converter functionality and merge with existing AttributePredicate
public class NewAttributePredicate extends org.openremote.model.query.filter.AttributePredicate {
- public AttributeMetaPredicate[] meta;
+ public MetaPredicate[] meta;
public ValuePredicate lastValue;
public DateTimePredicate valueTimestamp;
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/AttributeRefPredicate.java b/model/src/main/java/org/openremote/model/query/filter/RefPredicate.java
similarity index 74%
rename from model/src/main/java/org/openremote/model/query/filter/AttributeRefPredicate.java
rename to model/src/main/java/org/openremote/model/query/filter/RefPredicate.java
index 02ac1232e..52f46587b 100644
--- a/model/src/main/java/org/openremote/model/query/filter/AttributeRefPredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/RefPredicate.java
@@ -22,16 +22,16 @@ package org.openremote.model.query.filter;
import org.openremote.model.attribute.AttributeRef;
import org.openremote.model.attribute.MetaItemDescriptor;
-public class AttributeRefPredicate extends AttributeMetaPredicate {
+public class RefPredicate extends MetaPredicate {
- public AttributeRefPredicate() {
+ public RefPredicate() {
}
- public AttributeRefPredicate(AttributeRef attributeRef) {
+ public RefPredicate(AttributeRef attributeRef) {
this(attributeRef.getEntityId(), attributeRef.getAttributeName());
}
- public AttributeRefPredicate(String entityId, String attributeName) {
+ public RefPredicate(String entityId, String attributeName) {
super(
new StringArrayPredicate(
new StringPredicate(entityId),
@@ -39,7 +39,7 @@ public class AttributeRefPredicate extends AttributeMetaPredicate {
));
}
- public AttributeRefPredicate(String name, String entityId, String attributeName) {
+ public RefPredicate(String name, String entityId, String attributeName) {
super(
new StringPredicate(name),
new StringArrayPredicate(
@@ -48,11 +48,11 @@ public class AttributeRefPredicate extends AttributeMetaPredicate {
));
}
- public AttributeRefPredicate(MetaItemDescriptor metaItemDescriptor, String entityId, String attributeName) {
+ public RefPredicate(MetaItemDescriptor metaItemDescriptor, String entityId, String attributeName) {
this(metaItemDescriptor.getUrn(), entityId, attributeName);
}
- public AttributeRefPredicate(StringPredicate name, AttributeRef attributeRef) {
+ public RefPredicate(StringPredicate name, AttributeRef attributeRef) {
super(
name,
new StringArrayPredicate(
@@ -61,7 +61,7 @@ public class AttributeRefPredicate extends AttributeMetaPredicate {
));
}
- public AttributeRefPredicate(MetaItemDescriptor metaItemDescriptor, AttributeRef attributeRef) {
+ public RefPredicate(MetaItemDescriptor metaItemDescriptor, AttributeRef attributeRef) {
this(new StringPredicate(metaItemDescriptor.getUrn()), attributeRef);
}
}
diff --git a/model/src/main/java/org/openremote/model/query/filter/ValuePredicate.java b/model/src/main/java/org/openremote/model/query/filter/ValuePredicate.java
index d921d707d..453ec2e26 100644
--- a/model/src/main/java/org/openremote/model/query/filter/ValuePredicate.java
+++ b/model/src/main/java/org/openremote/model/query/filter/ValuePredicate.java
@@ -34,7 +34,8 @@ import org.openremote.model.value.ObjectValue;
@JsonSubTypes.Type(value = ObjectValueKeyPredicate.class, name = ObjectValueKeyPredicate.name),
@JsonSubTypes.Type(value = ArrayPredicate.class, name = ArrayPredicate.name),
@JsonSubTypes.Type(value = ValueEmptyPredicate.class, name = ValueEmptyPredicate.name),
- @JsonSubTypes.Type(value = ValueNotEmptyPredicate.class, name = ValueNotEmptyPredicate.name)
+ @JsonSubTypes.Type(value = ValueNotEmptyPredicate.class, name = ValueNotEmptyPredicate.name),
+ @JsonSubTypes.Type(value = CalendarEventPredicate.class, name = CalendarEventPredicate.name)
})
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
diff --git a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java
index 9a6581737..0a0b2e93a 100644
--- a/model/src/main/java/org/openremote/model/rules/AssetRuleset.java
+++ b/model/src/main/java/org/openremote/model/rules/AssetRuleset.java
@@ -19,12 +19,14 @@
*/
package org.openremote.model.rules;
+import org.hibernate.annotations.Formula;
+import org.openremote.model.calendar.CalendarEvent;
import org.openremote.model.value.ObjectValue;
+import org.openremote.model.value.Value;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
-import javax.persistence.Transient;
import java.util.Date;
/**
@@ -43,53 +45,131 @@ public class AssetRuleset extends Ruleset {
@Column(name = "ACCESS_PUBLIC_READ", nullable = false)
protected boolean accessPublicRead;
- @Transient
+ @Formula("(select a.REALM from Asset a where a.ID = ASSET_ID)")
protected String realm;
- public AssetRuleset() {
- }
-
- public AssetRuleset(String name, Lang lang, String rules, String assetId, boolean accessPublicRead, boolean continueOnError) {
- super(name, rules, lang, continueOnError);
- this.assetId = assetId;
- this.accessPublicRead = accessPublicRead;
- }
-
- public AssetRuleset(String name, Lang lang, ObjectValue meta, String rules, String assetId, boolean accessPublicRead, boolean continueOnError) {
- super(name, rules, lang, meta, continueOnError);
- this.assetId = assetId;
- this.accessPublicRead = accessPublicRead;
- }
+ public AssetRuleset() {}
- public AssetRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, String rules, String realm, String assetId, boolean accessPublicRead, boolean continueOnError) {
- super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta, continueOnError);
+ public AssetRuleset(String assetId, String name, Lang language, String rules) {
+ super(name, language, rules);
this.assetId = assetId;
- this.realm = realm;
- this.accessPublicRead = accessPublicRead;
}
public String getAssetId() {
return assetId;
}
- public void setAssetId(String assetId) {
+ public AssetRuleset setAssetId(String assetId) {
this.assetId = assetId;
+ return this;
}
public String getRealm() {
return realm;
}
- public void setRealm(String realm) {
+ public AssetRuleset setRealm(String realm) {
this.realm = realm;
+ return this;
}
public boolean isAccessPublicRead() {
return accessPublicRead;
}
- public void setAccessPublicRead(boolean accessPublicRead) {
+ public AssetRuleset setAccessPublicRead(boolean accessPublicRead) {
this.accessPublicRead = accessPublicRead;
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setId(Long id) {
+ super.setId(id);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setVersion(long version) {
+ super.setVersion(version);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setCreatedOn(Date createdOn) {
+ super.setCreatedOn(createdOn);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setLastModified(Date lastModified) {
+ super.setLastModified(lastModified);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setName(String name) {
+ super.setName(name);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setEnabled(boolean enabled) {
+ super.setEnabled(enabled);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setRules(String rules) {
+ super.setRules(rules);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setLang(Lang lang) {
+ super.setLang(lang);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setMeta(ObjectValue meta) {
+ super.setMeta(meta);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset addMeta(String key, Value value) {
+ super.addMeta(key, value);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset removeMeta(String key) {
+ super.removeMeta(key);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setStatus(RulesetStatus status) {
+ super.setStatus(status);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setError(String error) {
+ super.setError(error);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setContinueOnError(boolean continueOnError) {
+ super.setContinueOnError(continueOnError);
+ return this;
+ }
+
+ @Override
+ public AssetRuleset setValidity(CalendarEvent calendarEvent) {
+ super.setValidity(calendarEvent);
+ return this;
}
@Override
@@ -102,7 +182,7 @@ public class AssetRuleset extends Ruleset {
", createdOn='" + createdOn + '\'' +
", lastModified='" + lastModified + '\'' +
", enabled='" + enabled + '\'' +
- ", continueOnError='" + continueOnError + '\'' +
+ ", meta='" + meta + '\'' +
", realm='" + realm + '\'' +
", assetId='" + assetId + '\'' +
", accessPublicRead='" + accessPublicRead + '\'' +
diff --git a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java
index f07014f25..d5106e592 100644
--- a/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java
+++ b/model/src/main/java/org/openremote/model/rules/GlobalRuleset.java
@@ -19,7 +19,9 @@
*/
package org.openremote.model.rules;
+import org.openremote.model.calendar.CalendarEvent;
import org.openremote.model.value.ObjectValue;
+import org.openremote.model.value.Value;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -37,18 +39,100 @@ public class GlobalRuleset extends Ruleset {
public GlobalRuleset() {
}
- public GlobalRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, boolean continueOnError, String rules) {
- super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta, continueOnError);
+ public GlobalRuleset(String name, Lang language, String rules) {
+ super(name, language, rules);
}
- public GlobalRuleset(String name, Lang lang, String rules) {
- super(name, rules, lang, false);
+ @Override
+ public GlobalRuleset setId(Long id) {
+ super.setId(id);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setVersion(long version) {
+ super.setVersion(version);
+ return this;
}
- public GlobalRuleset(String name, Lang lang, String rules, ObjectValue meta) {
- super(name, rules, lang, meta, false);
+ @Override
+ public GlobalRuleset setCreatedOn(Date createdOn) {
+ super.setCreatedOn(createdOn);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setLastModified(Date lastModified) {
+ super.setLastModified(lastModified);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setName(String name) {
+ super.setName(name);
+ return this;
}
+ @Override
+ public GlobalRuleset setEnabled(boolean enabled) {
+ super.setEnabled(enabled);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setRules(String rules) {
+ super.setRules(rules);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setLang(Lang lang) {
+ super.setLang(lang);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setMeta(ObjectValue meta) {
+ super.setMeta(meta);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset addMeta(String key, Value value) {
+ super.addMeta(key, value);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset removeMeta(String key) {
+ super.removeMeta(key);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setStatus(RulesetStatus status) {
+ super.setStatus(status);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setError(String error) {
+ super.setError(error);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setContinueOnError(boolean continueOnError) {
+ super.setContinueOnError(continueOnError);
+ return this;
+ }
+
+ @Override
+ public GlobalRuleset setValidity(CalendarEvent calendarEvent) {
+ super.setValidity(calendarEvent);
+ return this;
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
@@ -59,8 +143,7 @@ public class GlobalRuleset extends Ruleset {
", createdOn='" + createdOn + '\'' +
", lastModified='" + lastModified + '\'' +
", enabled='" + enabled + '\'' +
- ", continueOnError='" + continueOnError + '\'' +
+ ", meta='" + meta + '\'' +
'}';
}
-
}
diff --git a/model/src/main/java/org/openremote/model/rules/Ruleset.java b/model/src/main/java/org/openremote/model/rules/Ruleset.java
index 09f63ad57..b209dbab5 100644
--- a/model/src/main/java/org/openremote/model/rules/Ruleset.java
+++ b/model/src/main/java/org/openremote/model/rules/Ruleset.java
@@ -21,7 +21,10 @@ package org.openremote.model.rules;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import org.openremote.model.calendar.CalendarEvent;
import org.openremote.model.value.ObjectValue;
+import org.openremote.model.value.Value;
+import org.openremote.model.value.Values;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
@@ -189,67 +192,60 @@ public abstract class Ruleset {
@org.hibernate.annotations.Type(type = PERSISTENCE_JSON_OBJECT_TYPE)
protected ObjectValue meta;
- @Column(name = "CONTINUE_ON_ERROR", nullable = false)
- protected boolean continueOnError = false;
-
@Transient
protected RulesetStatus status;
@Transient
protected String error;
- protected Ruleset() {
- }
+ public static final String META_KEY_CONTINUE_ON_ERROR = "urn:openremote:rule:meta:continueOnError";
+ public static final String META_KEY_VALIDITY = "urn:openremote:rule:meta:validity";
- public Ruleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, Lang lang) {
- this(id, version, createdOn, lastModified, name, enabled, null, lang, null, false);
- }
-
- public Ruleset(long id, long version, Date createdOn, Date lastModified, String name, boolean enabled, String rules, Lang lang, ObjectValue meta, boolean continueOnError) {
- this.id = id;
- this.version = version;
- this.createdOn = createdOn;
- this.lastModified = lastModified;
- this.name = name;
- this.enabled = enabled;
- this.rules = rules;
- this.lang = lang;
- this.meta = meta;
- this.continueOnError = continueOnError;
- }
-
- public Ruleset(String name, String rules, Lang lang, ObjectValue meta, boolean continueOnError) {
- this(name, rules, lang, continueOnError);
- this.meta = meta;
+ protected Ruleset() {
}
- public Ruleset(String name, String rules, Lang lang, boolean continueOnError) {
+ protected Ruleset(String name, Lang language, String rules) {
this.name = name;
+ this.lang = language;
this.rules = rules;
- this.lang = lang;
- this.continueOnError = continueOnError;
}
public Long getId() {
return id;
}
+ public Ruleset setId(Long id) {
+ this.id = id;
+ return this;
+ }
+
public long getVersion() {
return version;
}
+ public Ruleset setVersion(long version) {
+ this.version = version;
+ return this;
+ }
+
public Date getCreatedOn() {
return createdOn;
}
+ public Ruleset setCreatedOn(Date createdOn) {
+ this.createdOn = createdOn;
+ return this;
+ }
+
@PreUpdate
@PrePersist
public void updateLastModified() { // Don't call this setLastModified(), it confuses gwt-jackson
setLastModified(new Date());
}
- public void setLastModified(Date lastModified) {
+ public Ruleset setLastModified(Date lastModified) {
this.lastModified = lastModified;
+ return this;
}
public Date getLastModified() {
@@ -260,67 +256,118 @@ public abstract class Ruleset {
return name;
}
- public void setName(String name) {
+ public Ruleset setName(String name) {
this.name = name;
+ return this;
}
public boolean isEnabled() {
return enabled;
}
- public void setEnabled(boolean enabled) {
+ public Ruleset setEnabled(boolean enabled) {
this.enabled = enabled;
+ return this;
}
public String getRules() {
return rules;
}
- public void setRules(String rules) {
+ public Ruleset setRules(String rules) {
this.rules = rules;
- }
-
- public void setId(Long id) {
- this.id = id;
+ return this;
}
public Lang getLang() {
return lang;
}
- public void setLang(Lang lang) {
+ public Ruleset setLang(Lang lang) {
this.lang = lang;
+ return this;
}
public ObjectValue getMeta() {
return meta;
}
- public void setMeta(ObjectValue meta) {
+ public Optional<Value> getMeta(String key) {
+ return meta != null ? meta.get(key) : Optional.empty();
+ }
+
+ public Ruleset setMeta(ObjectValue meta) {
this.meta = meta;
+ return this;
+ }
+
+ public Ruleset addMeta(String key, Value value) {
+ if (meta == null) {
+ meta = Values.createObject();
+ }
+ meta.put(key, value);
+ return this;
+ }
+
+ public Ruleset removeMeta(String key) {
+ if (meta == null) {
+ return this;
+ }
+ meta.remove(key);
+ return this;
+ }
+
+ public boolean hasMeta(String key) {
+ return meta != null && meta.hasKey(key);
}
public RulesetStatus getStatus() {
return status;
}
- public void setStatus(RulesetStatus status) {
+ public Ruleset setStatus(RulesetStatus status) {
this.status = status;
+ return this;
}
public String getError() {
return error;
}
- public void setError(String error) {
+ public Ruleset setError(String error) {
this.error = error;
+ return this;
}
public boolean isContinueOnError() {
- return continueOnError;
+ return Values.getObject(meta).flatMap(objValue -> objValue.getBoolean(META_KEY_CONTINUE_ON_ERROR)).orElse(false);
+ }
+
+ public Ruleset setContinueOnError(boolean continueOnError) {
+ if (meta == null) {
+ meta = Values.createObject();
+ }
+ if (!continueOnError) {
+ meta.remove(META_KEY_CONTINUE_ON_ERROR);
+ } else {
+ meta.put(META_KEY_CONTINUE_ON_ERROR, true);
+ }
+ return this;
+ }
+
+ public CalendarEvent getValidity() {
+ return Values.getObject(meta).flatMap(objValue -> objValue.getObject(META_KEY_VALIDITY)).flatMap(CalendarEvent::fromValue).orElse(null);
}
- public void setContinueOnError(boolean continueOnError) {
- this.continueOnError = continueOnError;
+ public Ruleset setValidity(CalendarEvent calendarEvent) {
+ if (meta == null) {
+ meta = Values.createObject();
+ }
+ if (calendarEvent == null) {
+ meta.remove(META_KEY_VALIDITY);
+ } else {
+ meta.put(META_KEY_VALIDITY, calendarEvent.toValue());
+ }
+ return this;
}
}
diff --git a/model/src/main/java/org/openremote/model/rules/RulesetStatus.java b/model/src/main/java/org/openremote/model/rules/RulesetStatus.java
index 4537d6bdc..3f4db5b17 100644
--- a/model/src/main/java/org/openremote/model/rules/RulesetStatus.java
+++ b/model/src/main/java/org/openremote/model/rules/RulesetStatus.java
@@ -40,13 +40,33 @@ public enum RulesetStatus {
*/
EXECUTION_ERROR,
+ /**
+ * Ruleset caused a loop whilst being executed.
+ */
+ LOOP_ERROR,
+
/**
* Ruleset has been disabled.
*/
DISABLED,
+ /**
+ * Ruleset is outside of validity period but will be valid again in the future.
+ */
+ PAUSED,
+
+ /**
+ * Ruleset is outside of validity period and will nt be valid again.
+ */
+ EXPIRED,
+
/**
* Ruleset has been removed.
*/
- REMOVED
+ REMOVED,
+
+ /**
+ * Contains no rules
+ */
+ EMPTY
}
diff --git a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java b/model/src/main/java/org/openremote/model/rules/TenantRuleset.java
index 3abafa0d4..92c159a11 100644
--- a/model/src/main/java/org/openremote/model/rules/TenantRuleset.java
+++ b/model/src/main/java/org/openremote/model/rules/TenantRuleset.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017, OpenRemote Inc.
+ * Copyright 2019, OpenRemote Inc.
*
* See the CONTRIBUTORS.txt file in the distribution for a
* full listing of individual contributors.
@@ -19,7 +19,9 @@
*/
package org.openremote.model.rules;
+import org.openremote.model.calendar.CalendarEvent;
import org.openremote.model.value.ObjectValue;
+import org.openremote.model.value.Value;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -42,43 +44,121 @@ public class TenantRuleset extends Ruleset {
@Column(name = "ACCESS_PUBLIC_READ", nullable = false)
protected boolean accessPublicRead;
- public TenantRuleset() {
- }
-
- public TenantRuleset(String name, Lang lang, String rules, String realm, boolean accessPublicRead, boolean continueOnError) {
- super(name, rules, lang, continueOnError);
- this.realm = realm;
- this.accessPublicRead = accessPublicRead;
- }
-
- public TenantRuleset(String name, Lang lang, ObjectValue meta, String rules, String realm, boolean accessPublicRead, boolean continueOnError) {
- super(name, rules, lang, meta, continueOnError);
- this.realm = realm;
- this.accessPublicRead = accessPublicRead;
- }
+ public TenantRuleset() {}
- public TenantRuleset(long id, long version, Date createdOn, Date lastModified, boolean enabled, String name, Lang lang, ObjectValue meta, String rules, String realm, boolean accessPublicRead, boolean continueOnError) {
- super(id, version, createdOn, lastModified, name, enabled, rules, lang, meta, continueOnError);
+ public TenantRuleset(String realm, String name, Lang language, String rules) {
+ super(name, language, rules);
this.realm = realm;
- this.accessPublicRead = accessPublicRead;
}
public String getRealm() {
return realm;
}
- public void setRealm(String realm) {
+ public TenantRuleset setRealm(String realm) {
this.realm = realm;
+ return this;
}
public boolean isAccessPublicRead() {
return accessPublicRead;
}
- public void setAccessPublicRead(boolean accessPublicRead) {
+ public TenantRuleset setAccessPublicRead(boolean accessPublicRead) {
this.accessPublicRead = accessPublicRead;
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setId(Long id) {
+ super.setId(id);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setVersion(long version) {
+ super.setVersion(version);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setCreatedOn(Date createdOn) {
+ super.setCreatedOn(createdOn);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setLastModified(Date lastModified) {
+ super.setLastModified(lastModified);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setName(String name) {
+ super.setName(name);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setEnabled(boolean enabled) {
+ super.setEnabled(enabled);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setRules(String rules) {
+ super.setRules(rules);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setLang(Lang lang) {
+ super.setLang(lang);
+ return this;
}
+ @Override
+ public TenantRuleset setMeta(ObjectValue meta) {
+ super.setMeta(meta);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset addMeta(String key, Value value) {
+ super.addMeta(key, value);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset removeMeta(String key) {
+ super.removeMeta(key);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setStatus(RulesetStatus status) {
+ super.setStatus(status);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setError(String error) {
+ super.setError(error);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setContinueOnError(boolean continueOnError) {
+ super.setContinueOnError(continueOnError);
+ return this;
+ }
+
+ @Override
+ public TenantRuleset setValidity(CalendarEvent calendarEvent) {
+ super.setValidity(calendarEvent);
+ return this;
+ }
+
@Override
public String toString() {
return getClass().getSimpleName() + "{" +
@@ -89,7 +169,7 @@ public class TenantRuleset extends Ruleset {
", createdOn='" + createdOn + '\'' +
", lastModified='" + lastModified + '\'' +
", enabled='" + enabled + '\'' +
- ", continueOnError='" + continueOnError + '\'' +
+ ", meta='" + meta + '\'' +
", realm='" + realm + '\'' +
", accessPublicRead='" + accessPublicRead + '\'' +
'}';
diff --git a/model/src/main/java/org/openremote/model/rules/json/JsonRule.java b/model/src/main/java/org/openremote/model/rules/json/JsonRule.java
index 2102745b3..9d9bbe2ce 100644
--- a/model/src/main/java/org/openremote/model/rules/json/JsonRule.java
+++ b/model/src/main/java/org/openremote/model/rules/json/JsonRule.java
@@ -19,8 +19,8 @@
*/
package org.openremote.model.rules.json;
-import org.openremote.model.query.LogicGroup;
import org.openremote.model.query.AssetQuery;
+import org.openremote.model.query.LogicGroup;
/**
* A declarative rule definition a.k.a. JSON rules; consists of:
diff --git a/model/src/main/java/org/openremote/model/util/TimeUtil.java b/model/src/main/java/org/openremote/model/util/TimeUtil.java
index 79984d1d8..e936d5312 100644
--- a/model/src/main/java/org/openremote/model/util/TimeUtil.java
+++ b/model/src/main/java/org/openremote/model/util/TimeUtil.java
@@ -18,11 +18,16 @@ package org.openremote.model.util;
import javaemul.internal.annotations.GwtIncompatible;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.TemporalAccessor;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_TIME;
+
/**
* A helper class with utility methods for
* time related operations.
@@ -114,4 +119,40 @@ public class TimeUtil {
time = time != null ? time.trim() : null;
return "-*".equals(time);
}
+
+ /**
+ * Parses ISO8601 strings with optional time and/or offset; if no zone is provided then UTC is assumed if no
+ * time is provided then 00:00:00 is assumed.
+ */
+ public static long parseTimeIso8601(String datetime) {
+ DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+ .parseCaseInsensitive()
+ .append(ISO_LOCAL_DATE)
+ .optionalStart() // time made optional
+ .appendLiteral('T')
+ .append(ISO_LOCAL_TIME)
+ .optionalStart() // zone and offset made optional
+ .appendOffsetId()
+ .optionalStart()
+ .appendLiteral('[')
+ .parseCaseSensitive()
+ .appendZoneRegionId()
+ .appendLiteral(']')
+ .optionalEnd()
+ .optionalEnd()
+ .optionalEnd()
+ .toFormatter();
+
+ TemporalAccessor temporalAccessor = formatter.parseBest(datetime, ZonedDateTime::from, LocalDateTime::from, LocalDate::from);
+ ZonedDateTime zonedDateTime;
+
+ if (temporalAccessor instanceof ZonedDateTime) {
+ zonedDateTime = (ZonedDateTime)temporalAccessor;
+ } else if (temporalAccessor instanceof LocalDateTime) {
+ zonedDateTime = ((LocalDateTime)temporalAccessor).atZone(ZoneOffset.UTC);
+ } else {
+ zonedDateTime = ((LocalDate) temporalAccessor).atStartOfDay(ZoneOffset.UTC);
+ }
+ return zonedDateTime.toInstant().toEpochMilli();
+ }
}
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
index 433e084c6..f86a9a764 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
@@ -99,7 +99,7 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
def attributeValueTypeDescriptors = assetModelResource.getAttributeValueDescriptors(null)
then: "the default value types should be present"
- attributeValueTypeDescriptors.size() == 55
+ attributeValueTypeDescriptors.size() == 56
when: "a request for Attribute value types is made"
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
index 1b0a083da..8ba81c8c1 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy
@@ -10,7 +10,7 @@ import org.openremote.manager.setup.builtin.ManagerDemoSetup
import org.openremote.model.asset.Asset
import org.openremote.model.asset.AssetAttribute
import org.openremote.model.asset.AssetType
-import org.openremote.model.asset.CalendarEventConfiguration
+import org.openremote.model.attribute.AttributeValueType
import org.openremote.model.attribute.MetaItemType
import org.openremote.model.calendar.CalendarEvent
import org.openremote.model.calendar.RecurrenceRule
@@ -494,7 +494,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(selectExcludePathAndAttributes())
.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm))
- .attributeMeta(new AttributeMetaPredicate(MetaItemType.STORE_DATA_POINTS, new BooleanPredicate(true)))
+ .attributeMeta(new MetaPredicate(MetaItemType.STORE_DATA_POINTS, new BooleanPredicate(true)))
)
then: "result should match"
@@ -505,7 +505,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
assets = assetStorageService.findAll(
new AssetQuery()
.select(selectExcludePathAndAttributes())
- .attributeMeta(new AttributeMetaPredicate().itemValue(new StringPredicate(Match.END, "kWh")))
+ .attributeMeta(new MetaPredicate().itemValue(new StringPredicate(Match.END, "kWh")))
)
then: "result should match"
@@ -517,7 +517,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(selectExcludePathAndAttributes())
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
MetaItemType.AGENT_LINK,
managerDemoSetup.agentId,
managerDemoSetup.agentProtocolConfigName
@@ -534,7 +534,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(selectExcludePathAndAttributes())
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
MetaItemType.AGENT_LINK,
managerDemoSetup.agentId,
managerDemoSetup.agentProtocolConfigName
@@ -552,7 +552,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(selectExcludePathAndAttributes())
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
MetaItemType.AGENT_LINK,
managerDemoSetup.agentId,
managerDemoSetup.agentProtocolConfigName
@@ -569,7 +569,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(selectExcludePathAndAttributes())
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
MetaItemType.AGENT_LINK,
managerDemoSetup.agentId,
managerDemoSetup.agentProtocolConfigName
@@ -587,7 +587,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(selectExcludePathAndAttributes())
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
MetaItemType.AGENT_LINK,
managerDemoSetup.agentId,
managerDemoSetup.agentProtocolConfigName
@@ -604,7 +604,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
new AssetQuery()
.select(selectExcludePathAndAttributes())
.attributeMeta(
- new AttributeRefPredicate(
+ new RefPredicate(
managerDemoSetup.agentId,
managerDemoSetup.agentProtocolConfigName
)
@@ -866,15 +866,15 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "an asset is given a calendar event configuration attribute"
def lobby = assetStorageService.find(managerDemoSetup.lobbyId, true)
- def calendar = Calendar.getInstance(Locale.ROOT);
+ def calendar = Calendar.getInstance(Locale.ROOT)
calendar.setTimeInMillis(1517151600000) // 28/01/2018 @ 3:00pm (UTC)
def start = calendar.getTime()
calendar.add(Calendar.HOUR, 2)
def end = calendar.getTime()
- def recur = new RecurrenceRule(RecurrenceRule.Frequency.DAILY, 2, 5)
+ def recur = new RecurrenceRule(RecurrenceRule.Frequency.DAILY, 2, 5, null)
lobby.addAttributes(
- CalendarEventConfiguration.toAttribute(new CalendarEvent(start, end, recur))
+ new AssetAttribute("test", AttributeValueType.CALENDAR_EVENT, new CalendarEvent(start, end, recur).toValue())
)
lobby = assetStorageService.merge(lobby)
@@ -886,85 +886,65 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {
when: "a calendar event filtering query is executed for the correct date and time of the event"
def assets = assetStorageService.findAll(
new AssetQuery()
- .select(new Select().excludePath(true)) // Need attributes to do calendar filtering
+ .select(new Select().excludePath(true).excludeRealm(true).excludeAttributeMeta(true)) // Need attributes to do calendar filtering
.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm))
- .calendarEventActive(1517155200) // 28/01/2018 @ 4:00pm (UTC)
+ .attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517155200000)))) // 30/01/2018 @ 6:00pm (UTC)
.orderBy(new OrderBy(NAME))
)
- then: "all 5 realm assets should be returned"
- assets.size() == 5
- assets[0].id == managerDemoSetup.agentId
- assets[0].name == "Demo Agent"
- assets[1].id == managerDemoSetup.thingId
- assets[1].name == "Demo Thing"
- assets[2].id == managerDemoSetup.groundFloorId
- assets[2].name == "Ground Floor"
- assets[3].id == managerDemoSetup.lobbyId
- assets[3].name == "Lobby"
- assets[4].id == managerDemoSetup.smartOfficeId
- assets[4].name == "Smart Office"
+ then: "the lobby asset should be returned"
+ assets.size() == 1
+ assets[0].id == managerDemoSetup.lobbyId
+ assets[0].name == "Lobby"
when: "a calendar event filtering query is executed for future event on a correct day but wrong time"
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludePath(true))
.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm))
- .calendarEventActive(1517335200) // 30/01/2018 @ 6:00pm (UTC)
+ .attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517335200000)))) // 30/01/2018 @ 6:00pm (UTC)
.orderBy(new OrderBy(NAME))
)
- then: "the calendar event asset should not be included"
- assets.size() == 4
- !assets.any {it.name == "Lobby"}
+ then: "no assets should be returned"
+ assets.size() == 0
when: "a calendar event filtering query is executed for a future event on a wrong day but correct time"
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludePath(true))
.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm))
- .calendarEventActive(1517238600) // 29/01/2018 @ 3:10pm (UTC)
+ .attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517238600000)))) // 29/01/2018 @ 3:10pm (UTC)
.orderBy(new OrderBy(NAME))
)
- then: "the calendar event asset should not be included"
- assets.size() == 4
- !assets.any {it.name == "Lobby"}
+ then: "no assets should be returned"
+ assets.size() == 0
when: "a calendar event filtering query is executed inside a valid future event date and time"
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludePath(true)) // Need attributes to do calendar filtering
.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm))
- .calendarEventActive(1517849400) // 05/02/2018 @ 4:50pm (UTC))
+ .attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1517849400000)))) // 05/02/2018 @ 4:50pm (UTC))
.orderBy(new OrderBy(NAME))
)
- then: "all 5 realm assets should be returned"
- assets.size() == 5
- assets[0].id == managerDemoSetup.agentId
- assets[0].name == "Demo Agent"
- assets[1].id == managerDemoSetup.thingId
- assets[1].name == "Demo Thing"
- assets[2].id == managerDemoSetup.groundFloorId
- assets[2].name == "Ground Floor"
- assets[3].id == managerDemoSetup.lobbyId
- assets[3].name == "Lobby"
- assets[4].id == managerDemoSetup.smartOfficeId
- assets[4].name == "Smart Office"
+ then: "the lobby asset should be returned"
+ assets.size() == 1
+ assets[0].id == managerDemoSetup.lobbyId
when: "a calendar event filtering query is executed for some time after the last occurrence"
assets = assetStorageService.findAll(
new AssetQuery()
.select(new Select().excludePath(true))
.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm))
- .calendarEventActive(1518017520) // 02/07/2018 @ 3:32pm (UTC)
+ .attributes(new AttributePredicate(new StringPredicate("test"), new CalendarEventPredicate(new Date(1518017520000)))) // 02/07/2018 @ 3:32pm (UTC)
.orderBy(new OrderBy(NAME))
)
- then: "the calendar event asset should not be included"
- assets.size() == 4
- !assets.any {it.name == "Lobby"}
+ then: "no assets should be returned"
+ assets.size() == 0
}
def "DateTime queries"() {
diff --git a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
index afca7efd8..b4f7b4b91 100644
--- a/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/console/ConsoleTest.groovy
@@ -41,10 +41,10 @@ import java.util.stream.IntStream
import static org.openremote.manager.setup.builtin.ManagerDemoSetup.DEMO_RULE_STATES_CUSTOMER_A
import static org.openremote.manager.setup.builtin.ManagerDemoSetup.SMART_BUILDING_LOCATION
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID
-import static org.openremote.model.attribute.MetaItemType.RULE_STATE
import static org.openremote.model.asset.AssetResource.Util.WRITE_ATTRIBUTE_HTTP_METHOD
import static org.openremote.model.asset.AssetResource.Util.getWriteAttributeUrl
import static org.openremote.model.attribute.AttributeType.LOCATION
+import static org.openremote.model.attribute.MetaItemType.RULE_STATE
import static org.openremote.model.rules.RulesetStatus.DEPLOYED
import static org.openremote.model.util.TextUtil.isNullOrEmpty
import static org.openremote.model.value.Values.parse
@@ -97,11 +97,10 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
and: "the demo location predicate console rules are loaded"
Ruleset ruleset = new TenantRuleset(
- "Demo Tenant A - Console Location", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoConsoleLocation.groovy").text,
- keycloakDemoSetup.tenantA.realm,
- false,
- false
- )
+ keycloakDemoSetup.tenantA.realm,
+ "Demo Tenant A - Console Location",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoConsoleLocation.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engine to become available and be running"
@@ -500,11 +499,10 @@ class ConsoleTest extends Specification implements ManagerContainerTrait {
when: "a new ruleset is deployed on the console parent asset with multiple location predicate rules (including a duplicate and a rectangular predicate)"
def newRuleset = new AssetRuleset(
- "Console test location predicates", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/BasicLocationPredicates.groovy").text,
- testUser3Console1.parentId,
- false,
- false
- )
+ testUser3Console1.parentId,
+ "Console test location predicates",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicLocationPredicates.groovy").text)
newRuleset = rulesetStorageService.merge(newRuleset)
RulesEngine consoleParentEngine = null
def newLocationPredicate = new RadialGeofencePredicate(50, 0, -60)
diff --git a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy b/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy
index 8a3715219..f172f1517 100644
--- a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy
@@ -11,6 +11,7 @@ import org.openremote.manager.setup.builtin.ManagerDemoSetup
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.RulesetStatus
+import org.openremote.model.value.Values
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -30,23 +31,22 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy").text,
- managerDemoSetup.apartment2Id,
- false,
- false
- )
+ managerDemoSetup.apartment2Id,
+ "Failure Ruleset",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/org/openremote/test/failure/RulesFailureConditionInvalidReturn.groovy").text)
ruleset = rulesetStorageService.merge(ruleset)
expect: "the rule engine should have an error (first firing after initial asset state insert)"
conditions.eventually {
apartment2Engine = rulesService.assetEngines.get(managerDemoSetup.apartment2Id)
assert apartment2Engine != null
- assert apartment2Engine.deployments[ruleset.id].status == RulesetStatus.EXECUTION_ERROR
- assert apartment2Engine.deployments[ruleset.id].error instanceof IllegalArgumentException
- assert apartment2Engine.deployments[ruleset.id].error.message == "Error evaluating condition of rule 'The when condition is illegal, it's returning an Optional instead of a boolean': result is not boolean but Optional.empty"
assert apartment2Engine.isError()
assert apartment2Engine.getError() instanceof RuntimeException
assert apartment2Engine.getError().message.startsWith("Ruleset deployments have errors, failed compilation: 0, failed execution: 1")
+ assert apartment2Engine.deployments[ruleset.id].status == RulesetStatus.EXECUTION_ERROR
+ assert apartment2Engine.deployments[ruleset.id].error instanceof IllegalArgumentException
+ assert apartment2Engine.deployments[ruleset.id].error.message == "Error evaluating condition of rule 'The when condition is illegal, it's returning an Optional instead of a boolean': result is not boolean but Optional.empty"
}
cleanup: "stop the container"
@@ -66,11 +66,10 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy").text,
- managerDemoSetup.apartment2Id,
- false,
- false
- )
+ managerDemoSetup.apartment2Id,
+ "Failure Ruleset",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/org/openremote/test/failure/RulesFailureConditionThrowsException.groovy").text)
ruleset = rulesetStorageService.merge(ruleset)
expect: "the rule engine should have an error (first firing after initial asset state insert)"
@@ -102,11 +101,10 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text,
- managerDemoSetup.apartment2Id,
- false,
- false
- )
+ managerDemoSetup.apartment2Id,
+ "Failure Ruleset",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text)
ruleset = rulesetStorageService.merge(ruleset)
expect: "the rule engine should have an error (first firing after initial asset state insert)"
@@ -138,18 +136,18 @@ class RulesExecutionFailureTest extends Specification implements ManagerContaine
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Failure Ruleset", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text,
- managerDemoSetup.apartment2Id,
- false,
- true
- )
+ managerDemoSetup.apartment2Id,
+ "Failure Ruleset",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text)
+ .addMeta(Ruleset.META_KEY_CONTINUE_ON_ERROR, Values.create(true))
ruleset = rulesetStorageService.merge(ruleset)
expect: "the rule engine should have an error (first firing after initial asset state insert)"
conditions.eventually {
apartment2Engine = rulesService.assetEngines.get(managerDemoSetup.apartment2Id)
assert apartment2Engine != null
- assert apartment2Engine.deployments[ruleset.id].status == RulesetStatus.EXECUTION_ERROR
+ assert apartment2Engine.deployments[ruleset.id].status == RulesetStatus.LOOP_ERROR
assert apartment2Engine.deployments[ruleset.id].error instanceof RulesLoopException
assert apartment2Engine.deployments[ruleset.id].error.message == "Possible rules loop detected, exceeded max trigger count of " + RulesFacts.MAX_RULES_TRIGGERED_PER_EXECUTION + " for rule: Condition loops"
assert apartment2Engine.isError()
diff --git a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
index 0c3ee6f80..85b14695c 100644
--- a/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/protocol/http/HttpServerProtocolTest.groovy
@@ -21,6 +21,7 @@ package org.openremote.test.protocol.http
import org.jboss.resteasy.spi.ResteasyUriInfo
import org.jboss.resteasy.util.BasicAuthHelper
+import org.openremote.agent.protocol.controller.PollingKey
import org.openremote.agent.protocol.http.*
import org.openremote.manager.agent.AgentService
import org.openremote.manager.asset.AssetProcessingService
@@ -421,8 +422,10 @@ class HttpServerProtocolTest extends Specification implements ManagerContainerTr
when: "an attempt is made to use the removed endpoint"
authenticatedTestResource.postAsset(testAsset)
- then: "an exception should be thrown"
- thrown Exception
+ then: "the asset should not have been posted"
+ new PollingConditions(initialDelay: 3).eventually {
+ assert testServerProtocol.resource1.postedAssets.size() == 2
+ }
cleanup: "the server should be stopped"
stopContainer(container)
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
index ac6218889..e7ae35083 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesDeploymentTest.groovy
@@ -11,7 +11,9 @@ import org.openremote.manager.setup.builtin.KeycloakDemoSetup
import org.openremote.manager.setup.builtin.ManagerDemoSetup
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.GlobalRuleset
+import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.TenantRuleset
+import org.openremote.model.value.Values
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
@@ -74,11 +76,10 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
when: "a new tenant rule definition is added to Tenant A"
ruleset = new TenantRuleset(
- "Some more tenantA tenant rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text,
- keycloakDemoSetup.tenantA.realm,
- false,
- false
- )
+ keycloakDemoSetup.tenantA.realm,
+ "Some more tenantA tenant rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text)
rulesetStorageService.merge(ruleset)
then: "Tenant A rules engine should load this definition and restart successfully"
@@ -93,11 +94,10 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
when: "a new tenant rule definition is added to Tenant B"
ruleset = new TenantRuleset(
- "Some more tenantB tenant rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text,
- keycloakDemoSetup.tenantB.realm,
- false,
- false
- )
+ keycloakDemoSetup.tenantB.realm,
+ "Some more tenantB tenant rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates2.groovy").text)
rulesetStorageService.merge(ruleset)
then: "a tenant rules engine should be created for Tenant B and load this definition and start successfully"
@@ -111,7 +111,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
}
when: "the disabled rule definition for Tenant B is enabled"
- ruleset = rulesetStorageService.findById(TenantRuleset.class, rulesImport.tenantBRulesetId)
+ ruleset = rulesetStorageService.find(TenantRuleset.class, rulesImport.tenantBRulesetId)
ruleset.setEnabled(true)
rulesetStorageService.merge(ruleset)
@@ -128,7 +128,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
when: "the enabled rule definition for Tenant B is disabled"
// TODO: Stop instances of rule definitions being passed around as rules engine nulls the rules property
- ruleset = rulesetStorageService.findById(TenantRuleset.class, rulesImport.tenantBRulesetId)
+ ruleset = rulesetStorageService.find(TenantRuleset.class, rulesImport.tenantBRulesetId)
ruleset.setEnabled(false)
rulesetStorageService.merge(ruleset)
@@ -164,7 +164,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
then: "the global rules engine should not run and the rule engine status should indicate the issue"
conditions.eventually {
assert rulesService.globalEngine.deployments.size() == 3
- assert rulesService.globalEngine.running == false
+ assert !rulesService.globalEngine.running
assert rulesService.globalEngine.isError()
assert rulesService.globalEngine.error instanceof RuntimeException
assert rulesService.globalEngine.deployments.values().any({ it.name == "Some global demo rules" && it.status == READY})
@@ -178,8 +178,8 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
then: "the global rules engine should restart"
conditions.eventually {
assert rulesService.globalEngine.deployments.size() == 2
- assert rulesService.globalEngine.running == true
- assert rulesService.globalEngine.isError() == false
+ assert rulesService.globalEngine.running
+ assert !rulesService.globalEngine.isError()
assert rulesService.globalEngine.deployments.values().any({ it.name == "Some global demo rules" && it.status == DEPLOYED })
assert rulesService.globalEngine.deployments.values().any({ it.name == "Some more global rules" && it.status == DEPLOYED })
}
@@ -234,11 +234,11 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
when: "a new tenant rule definition is added to Tenant A"
ruleset = new TenantRuleset(
- "Throw Failure Exception", GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text,
- keycloakDemoSetup.tenantA.realm,
- false,
- true
- )
+ keycloakDemoSetup.tenantA.realm,
+ "Throw Failure Exception",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/failure/RulesFailureActionThrowsException.groovy").text)
+ .addMeta(Ruleset.META_KEY_CONTINUE_ON_ERROR, Values.create(true))
ruleset = rulesetStorageService.merge(ruleset)
then: "the tenants A rule engine should run with one deployment as error"
@@ -253,11 +253,11 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
when: "a new tenant rule definition is added to Tenant A"
ruleset = new TenantRuleset(
- "Looping error", GROOVY, getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text,
- keycloakDemoSetup.tenantA.realm,
- false,
- true
- )
+ keycloakDemoSetup.tenantA.realm,
+ "Looping error",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/failure/RulesFailureLoop.groovy").text)
+ .addMeta(Ruleset.META_KEY_CONTINUE_ON_ERROR, Values.create(true))
ruleset = rulesetStorageService.merge(ruleset)
then: "the tenants A rule engine should have an error"
@@ -266,7 +266,7 @@ class BasicRulesDeploymentTest extends Specification implements ManagerContainer
assert tenantAEngine != null
assert !tenantAEngine.isRunning()
assert tenantAEngine.deployments.size() == 4
- assert tenantAEngine.deployments[ruleset.id].status == EXECUTION_ERROR
+ assert tenantAEngine.deployments[ruleset.id].status == LOOP_ERROR
assert tenantAEngine.deployments[ruleset.id].error instanceof RulesLoopException
assert tenantAEngine.deployments[ruleset.id].error.message == "Possible rules loop detected, exceeded max trigger count of " + RulesFacts.MAX_RULES_TRIGGERED_PER_EXECUTION + " for rule: Condition loops"
assert tenantAEngine.isError()
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy
index 6769dd26b..d4cebb018 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesImport.groovy
@@ -5,17 +5,14 @@ import org.openremote.manager.rules.RulesService
import org.openremote.manager.rules.RulesetStorageService
import org.openremote.manager.setup.builtin.KeycloakDemoSetup
import org.openremote.manager.setup.builtin.ManagerDemoSetup
-import org.openremote.model.attribute.MetaItem
-import org.openremote.model.attribute.MetaItemDescriptor
-import org.openremote.model.attribute.MetaItemDescriptorImpl
import org.openremote.model.rules.AssetRuleset
import org.openremote.model.rules.GlobalRuleset
import org.openremote.model.rules.Ruleset
import org.openremote.model.rules.TenantRuleset
import org.openremote.model.value.Values
-import static org.openremote.model.rules.RulesetStatus.DEPLOYED
import static org.openremote.model.rules.Ruleset.Lang.GROOVY
+import static org.openremote.model.rules.RulesetStatus.DEPLOYED
class BasicRulesImport {
@@ -41,67 +38,58 @@ class BasicRulesImport {
Ruleset ruleset = new GlobalRuleset(
"Some global demo rules", GROOVY,
- getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text
- )
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
globalRulesetId = rulesetStorageService.merge(ruleset).id
ruleset = new GlobalRuleset(
"Other global demo rules with a long name that should fill up space in UI", GROOVY,
- getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text
- )
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
ruleset.setEnabled(false)
globalRuleset2Id = rulesetStorageService.merge(ruleset).id
ruleset = new TenantRuleset(
- "Some master tenant demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,
- keycloakDemoSetup.masterTenant.realm
- ,
- false,
- false
- )
+ keycloakDemoSetup.masterTenant.realm,
+ "Some master tenant demo rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
masterRulesetId = rulesetStorageService.merge(ruleset).id
ruleset = new TenantRuleset(
- "Some tenantA tenant demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,
- keycloakDemoSetup.tenantA.realm,
- false,
- false
- )
+ keycloakDemoSetup.tenantA.realm,
+ "Some tenantA tenant demo rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
tenantARulesetId = rulesetStorageService.merge(ruleset).id
ruleset = new TenantRuleset(
- "Some tenantB tenant demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,
- keycloakDemoSetup.tenantB.realm,
- false,
- false
- )
+ keycloakDemoSetup.tenantB.realm,
+ "Some tenantB tenant demo rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
ruleset.setEnabled(false)
tenantBRulesetId = rulesetStorageService.merge(ruleset).id
ruleset = new AssetRuleset(
- "Some apartment 1 demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Some apartment 1 demo rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
ruleset.setEnabled(false)
apartment1RulesetId = rulesetStorageService.merge(ruleset).id
ruleset = new AssetRuleset(
- "Some apartment 2 demo rules", GROOVY, Values.createObject().put("visible", true),
- getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,
- managerDemoSetup.apartment2Id,
- false,
- false
- )
+ managerDemoSetup.apartment2Id,
+ "Some apartment 2 demo rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
+ .addMeta("visible", Values.create(true))
apartment2RulesetId = rulesetStorageService.merge(ruleset).id
ruleset = new AssetRuleset(
- "Some apartment 3 demo rules", GROOVY, getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text,
- managerDemoSetup.apartment3Id,
- false,
- false
- )
+ managerDemoSetup.apartment3Id,
+ "Some apartment 3 demo rules",
+ GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicMatchAllAssetStates.groovy").text)
apartment3RulesetId = rulesetStorageService.merge(ruleset).id
}
@@ -181,5 +169,4 @@ class BasicRulesImport {
static void assertRulesFired(RulesEngine engine, Collection<String> facts) {
engine.facts.namedFacts.keySet().containsAll(facts)
}
-
}
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
index 30238df40..e6d17cae2 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy
@@ -30,72 +30,6 @@ import static org.openremote.test.rules.BasicRulesImport.assertRulesFired
class BasicRulesProcessingTest extends Specification implements ManagerContainerTrait {
- def "Check scoped firing of rules"() {
- given: "expected conditions"
- def conditions = new PollingConditions(timeout: 10, initialDelay: 0.5, delay: 0.5)
-
- and: "the container is started"
- def serverPort = findEphemeralPort()
- def container = startContainer(defaultConfig(serverPort), defaultServices())
- def managerDemoSetup = container.getService(SetupService.class).getTaskOfType(ManagerDemoSetup.class)
- def keycloakDemoSetup = container.getService(SetupService.class).getTaskOfType(KeycloakDemoSetup.class)
- def rulesService = container.getService(RulesService.class)
- def rulesetStorageService = container.getService(RulesetStorageService.class)
- def assetProcessingService = container.getService(AssetProcessingService.class)
-
- and: "some test rulesets have been imported"
- def rulesImport = new BasicRulesImport(rulesetStorageService, keycloakDemoSetup, managerDemoSetup)
-
- expect: "the rules engines to be ready"
- conditions.eventually {
- rulesImport.assertEnginesReady(rulesService, keycloakDemoSetup, managerDemoSetup)
- }
-
- and: "the demo attributes marked with RULE_STATE = true meta should be inserted into the engines"
- conditions.eventually {
- assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL
- assert rulesImport.globalEngine.assetStates.size() == DEMO_RULE_STATES_GLOBAL
- assert rulesImport.masterEngine.assetStates.size() == DEMO_RULE_STATES_SMART_OFFICE
- assert rulesImport.tenantAEngine.assetStates.size() == DEMO_RULE_STATES_CUSTOMER_A
- assert rulesImport.apartment2Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_2
- assert rulesImport.apartment3Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_3
- }
-
- when: "an attribute event is pushed into the system for an attribute with RULE_STATE meta set to true"
- rulesImport.resetRulesFired()
- def apartment2LivingRoomPresenceDetectedChange = new AttributeEvent(
- managerDemoSetup.apartment2LivingroomId, "presenceDetected", Values.create(true)
- )
- assetProcessingService.sendAttributeEvent(apartment2LivingRoomPresenceDetectedChange)
-
- then: "the rule engines in scope should fire the 'All' rule"
- conditions.eventually {
- def expectedFiredRules = ["All"]
- assertRulesFired(rulesImport.globalEngine, 1)
- assertRulesFired(rulesImport.globalEngine, expectedFiredRules)
- assertRulesFired(rulesImport.tenantAEngine, 1)
- assertRulesFired(rulesImport.tenantAEngine, expectedFiredRules)
- assertRulesFired(rulesImport.apartment2Engine, 1)
- assertRulesFired(rulesImport.apartment2Engine, expectedFiredRules)
- assertRulesFired(rulesImport.apartment3Engine, 0)
- }
-
- when: "an attribute event is pushed into the system for an attribute with no RULE_STATE meta"
- rulesImport.resetRulesFired()
- def apartment2LivingRoomWindowOpenChange = new AttributeEvent(
- managerDemoSetup.apartment2LivingroomId, "windowOpen", Values.create(true)
- )
- assetProcessingService.sendAttributeEvent(apartment2LivingRoomWindowOpenChange)
-
- then: "no rule engines should have fired after a few seconds"
- new PollingConditions(initialDelay: 3).eventually {
- rulesImport.assertNoRulesFired()
- }
-
- cleanup: "the server should be stopped"
- stopContainer(container)
- }
-
def "Check firing when deploying a new ruleset"() {
given: "expected conditions"
def conditions = new PollingConditions(timeout: 10, initialDelay: 0.5, delay: 0.5)
@@ -129,11 +63,10 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
when: "a LHS filtering test rule definition is loaded into the Smart Building asset"
def assetRuleset = new AssetRuleset(
- "Some Smart Building asset rules", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy").text,
- managerDemoSetup.smartBuildingId,
- false,
- false
- )
+ managerDemoSetup.smartBuildingId,
+ "Some Smart Building asset rules",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicSmartHomeMatchAllAssetStates.groovy").text)
rulesetStorageService.merge(assetRuleset)
RulesEngine smartHomeEngine = null
@@ -186,7 +119,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
stopContainer(container)
}
- def "Handle asset create, update, delete"() {
+ def "Handle attribute event with no meta, asset create, update, delete"() {
given: "expected conditions"
def conditions = new PollingConditions(timeout: 15, initialDelay: 0.5, delay: 0.5)
@@ -198,6 +131,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
def rulesService = container.getService(RulesService.class)
def rulesetStorageService = container.getService(RulesetStorageService.class)
def assetStorageService = container.getService(AssetStorageService.class)
+ def assetProcessingService = container.getService(AssetProcessingService.class)
and: "some test rulesets have been imported"
def rulesImport = new BasicRulesImport(rulesetStorageService, keycloakDemoSetup, managerDemoSetup)
@@ -222,6 +156,15 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
asset.setAttributes(attributes)
asset = assetStorageService.merge(asset)
+ then: "the rules engines should have executed at least once"
+ conditions.eventually {
+ assert rulesImport.globalEngine.lastFireTimestamp > 0
+ assert rulesImport.masterEngine.lastFireTimestamp > 0
+ assert rulesImport.tenantAEngine.lastFireTimestamp > 0
+ assert rulesImport.apartment2Engine.lastFireTimestamp > 0
+ assert rulesImport.apartment3Engine.lastFireTimestamp > 0
+ }
+
then: "after a few seconds the engines in scope should have facts and rules should have fired"
conditions.eventually {
assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 1
@@ -241,8 +184,38 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
assertRulesFired(rulesImport.apartment3Engine, 0)
}
+ when: "an attribute event is pushed into the system for an attribute with no RULE_STATE meta"
+ def globalLastFireTimestamp = rulesImport.globalEngine.lastFireTimestamp
+ def masterLastFireTimestamp = rulesImport.masterEngine.lastFireTimestamp
+ def tenantALastFireTimestamp = rulesImport.tenantAEngine.lastFireTimestamp
+ def apartment2LastFireTimestamp = rulesImport.apartment2Engine.lastFireTimestamp
+ def apartment3LastFireTimestamp = rulesImport.apartment3Engine.lastFireTimestamp
+ def apartment2LivingRoomWindowOpenChange = new AttributeEvent(
+ managerDemoSetup.apartment2LivingroomId, "windowOpen", Values.create(true)
+ )
+ assetProcessingService.sendAttributeEvent(apartment2LivingRoomWindowOpenChange)
+
+ then: "the attribute event should have been processed"
+ conditions.eventually {
+ def apartment2LivingRoom = assetStorageService.find(managerDemoSetup.apartment2LivingroomId, true)
+ assert apartment2LivingRoom.getAttribute("windowOpen").flatMap{it.getValueAsBoolean()}.orElse(false)
+ }
+
+ then: "the rules engines should not have executed"
+ conditions.eventually {
+ assert rulesImport.globalEngine.lastFireTimestamp == globalLastFireTimestamp
+ assert rulesImport.masterEngine.lastFireTimestamp == masterLastFireTimestamp
+ assert rulesImport.tenantAEngine.lastFireTimestamp == tenantALastFireTimestamp
+ assert rulesImport.apartment2Engine.lastFireTimestamp == apartment2LastFireTimestamp
+ assert rulesImport.apartment3Engine.lastFireTimestamp == apartment3LastFireTimestamp
+ }
+
when: "the Kitchen room asset is modified to add a new attribute but RULE_STATE = true meta is not changed"
- rulesImport.resetRulesFired()
+ globalLastFireTimestamp = rulesImport.globalEngine.lastFireTimestamp
+ masterLastFireTimestamp = rulesImport.masterEngine.lastFireTimestamp
+ tenantALastFireTimestamp = rulesImport.tenantAEngine.lastFireTimestamp
+ apartment2LastFireTimestamp = rulesImport.apartment2Engine.lastFireTimestamp
+ apartment3LastFireTimestamp = rulesImport.apartment3Engine.lastFireTimestamp
attributes = [
new AssetAttribute("testString", AttributeValueType.STRING, Values.create("test"))
.setMeta(
@@ -253,17 +226,27 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
asset.setAttributes(attributes)
asset = assetStorageService.merge(asset)
- then: "after a few seconds the fact count shouldn't change and no rules should have fired"
- new PollingConditions(initialDelay: 3).eventually {
+ then: "the rules engines should have executed at least one more time"
+ conditions.eventually {
+ assert rulesImport.globalEngine.lastFireTimestamp > globalLastFireTimestamp
+ assert rulesImport.masterEngine.lastFireTimestamp == masterLastFireTimestamp
+ assert rulesImport.tenantAEngine.lastFireTimestamp > tenantALastFireTimestamp
+ assert rulesImport.apartment2Engine.lastFireTimestamp > apartment2LastFireTimestamp
+ assert rulesImport.apartment3Engine.lastFireTimestamp == apartment3LastFireTimestamp
+ }
+
+ then: "no rules should have fired"
+ conditions.eventually {
assert rulesService.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 1
assert rulesImport.globalEngine.assetStates.size() == DEMO_RULE_STATES_GLOBAL + 1
assert rulesImport.masterEngine.assetStates.size() == DEMO_RULE_STATES_SMART_OFFICE
assert rulesImport.tenantAEngine.assetStates.size() == DEMO_RULE_STATES_CUSTOMER_A + 1
assert rulesImport.apartment2Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_2 + 1
assert rulesImport.apartment3Engine.assetStates.size() == DEMO_RULE_STATES_APARTMENT_3
- assertRulesFired(rulesImport.globalEngine, 0)
- assertRulesFired(rulesImport.tenantAEngine, 0)
- assertRulesFired(rulesImport.apartment2Engine, 0)
+ assertRulesFired(rulesImport.globalEngine, 1)
+ assertRulesFired(rulesImport.masterEngine, 1)
+ assertRulesFired(rulesImport.tenantAEngine, 1)
+ assertRulesFired(rulesImport.apartment2Engine, 1)
assertRulesFired(rulesImport.apartment3Engine, 0)
}
@@ -377,11 +360,10 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
when: "a broken RHS rule is loaded into the tenantA engine"
def ruleset = new TenantRuleset(
- "Some broken test rules", Ruleset.Lang.GROOVY, getClass().getResource("/org/openremote/test/rules/BasicBrokenRules.groovy").text,
- keycloakDemoSetup.tenantA.realm,
- false,
- false
- )
+ keycloakDemoSetup.tenantA.realm,
+ "Some broken test rules",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/org/openremote/test/rules/BasicBrokenRules.groovy").text)
rulesetStorageService.merge(ruleset)
then: "the tenantA engine should not run and the rule engine status should indicate the issue"
@@ -397,13 +379,27 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
}
when: "an attribute event occurs"
+ def globalLastFireTimestamp = rulesImport.globalEngine.lastFireTimestamp
+ def masterLastFireTimestamp = rulesImport.masterEngine.lastFireTimestamp
+ def tenantALastFireTimestamp = rulesImport.tenantAEngine.lastFireTimestamp
+ def apartment2LastFireTimestamp = rulesImport.apartment2Engine.lastFireTimestamp
+ def apartment3LastFireTimestamp = rulesImport.apartment3Engine.lastFireTimestamp
def apartment2LivingRoomPresenceDetectedChange = new AttributeEvent(
managerDemoSetup.apartment2LivingroomId, "presenceDetected", Values.create(true)
)
assetProcessingService.sendAttributeEvent(apartment2LivingRoomPresenceDetectedChange)
+ then: "the rules engines should have executed at least one more time"
+ conditions.eventually {
+ assert rulesImport.globalEngine.lastFireTimestamp > globalLastFireTimestamp
+ assert rulesImport.masterEngine.lastFireTimestamp > masterLastFireTimestamp
+ assert rulesImport.tenantAEngine.lastFireTimestamp == tenantALastFireTimestamp
+ assert rulesImport.apartment2Engine.lastFireTimestamp > apartment2LastFireTimestamp
+ assert rulesImport.apartment3Engine.lastFireTimestamp > apartment3LastFireTimestamp
+ }
+
then: "the broken rules engine should prevent a database update"
- new PollingConditions(initialDelay: 3).eventually {
+ conditions.eventually {
def asset = assetStorageService.find(managerDemoSetup.apartment2LivingroomId, true)
assert asset.getAttribute("presenceDetected").get().getValueAsBoolean().isPresent()
assert !asset.getAttribute("presenceDetected").get().getValueAsBoolean().get()
@@ -412,6 +408,4 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainer
cleanup: "the server should be stopped"
stopContainer(container)
}
-
- //TODO add test for location Predicates in AssetQueryPredicate
}
diff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
index 43cc5ecf5..572765e5b 100644
--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesetResourceTest.groovy
@@ -137,7 +137,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 404
when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false, false)
+ def tenantRuleset = new TenantRuleset(keycloakDemoSetup.masterTenant.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)[1].id
tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
@@ -200,7 +200,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 404
when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)
+ tenantRuleset = new TenantRuleset(keycloakDemoSetup.tenantA.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.tenantA.realm, null, false)[1].id
tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
@@ -216,7 +216,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
tenantRuleset.realm == keycloakDemoSetup.tenantA.realm
when: "an asset ruleset is created in the authenticated realm"
- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false, false)
+ def assetRuleset = new AssetRuleset(managerDemoSetup.smartOfficeId, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, null, false)[0].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
@@ -279,7 +279,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 404
when: "an asset ruleset is created in a non-authenticated realm"
- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment2Id, false, false)
+ assetRuleset = new AssetRuleset(managerDemoSetup.apartment2Id, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment2Id, null, false)[1].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
@@ -383,7 +383,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.masterTenant.realm, false, false)
+ def tenantRuleset = new TenantRuleset(keycloakDemoSetup.masterTenant.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
def rulesetId = rulesetResource.getTenantRulesets(null, keycloakDemoSetup.masterTenant.realm, null, false)[1].id
tenantRuleset = rulesetResource.getTenantRuleset(null, rulesetId)
@@ -446,7 +446,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 404
when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)
+ tenantRuleset = new TenantRuleset(keycloakDemoSetup.tenantA.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
then: "access should be forbidden"
@@ -454,7 +454,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "an asset ruleset is created in the authenticated realm"
- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false, false)
+ def assetRuleset = new AssetRuleset(managerDemoSetup.smartOfficeId, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.smartOfficeId, null, false)[0].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
@@ -517,7 +517,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 404
when: "an asset ruleset is created in a non-authenticated realm"
- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment2Id, false, false)
+ assetRuleset = new AssetRuleset(managerDemoSetup.apartment2Id, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
then: "access should be forbidden"
@@ -611,7 +611,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)
+ def tenantRuleset = new TenantRuleset(keycloakDemoSetup.tenantA.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
then: "access should be forbidden"
@@ -633,7 +633,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false, false)
+ tenantRuleset = new TenantRuleset(keycloakDemoSetup.tenantB.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
then: "access should be forbidden"
@@ -641,7 +641,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "a tenant ruleset is created in the authenticated realm"
- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)
+ def assetRuleset = new AssetRuleset(keycloakDemoSetup.tenantA.realm, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
then: "access should be forbidden"
@@ -663,7 +663,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "a tenant ruleset is created in a non-authenticated realm"
- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false, false)
+ assetRuleset = new AssetRuleset(keycloakDemoSetup.tenantB.realm, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
then: "access should be forbidden"
@@ -764,7 +764,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "a tenant ruleset is created in the authenticated realm"
- def tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantA.realm, false, false)
+ def tenantRuleset = new TenantRuleset(keycloakDemoSetup.tenantA.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
then: "access should be forbidden"
@@ -787,7 +787,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 404
when: "a tenant ruleset is created in a non-authenticated realm"
- tenantRuleset = new TenantRuleset("Test tenant definition", GROOVY, "SomeRulesCode", keycloakDemoSetup.tenantB.realm, false, false)
+ tenantRuleset = new TenantRuleset(keycloakDemoSetup.tenantB.realm, "Test tenant definition", GROOVY, "SomeRulesCode")
rulesetResource.createTenantRuleset(null, tenantRuleset)
then: "access should be forbidden"
@@ -795,7 +795,11 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "an asset ruleset is created in the authenticated realm"
- def assetRuleset = new AssetRuleset("Test asset definition", GROOVY, Values.createObject().put("visible", true), "SomeRulesCode", managerDemoSetup.apartment1Id, false, false)
+ def assetRuleset = new AssetRuleset(
+ managerDemoSetup.apartment1Id,
+ "Test asset definition",
+ GROOVY, "SomeRulesCode")
+ .addMeta("visible", Values.create(true))
rulesetResource.createAssetRuleset(null, assetRuleset)
def rulesetId = rulesetResource.getAssetRulesets(null, managerDemoSetup.apartment1Id, null, false)[1].id
assetRuleset = rulesetResource.getAssetRuleset(null, rulesetId)
@@ -867,7 +871,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 404
when: "an asset ruleset is created in the authenticated realm but on a forbidden asset "
- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.apartment3Id, false, false)
+ assetRuleset = new AssetRuleset(managerDemoSetup.apartment3Id, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
then: "access should be forbidden"
@@ -875,7 +879,7 @@ class BasicRulesetResourceTest extends Specification implements ManagerContainer
ex.response.status == 403
when: "an asset ruleset is created in a non-authenticated realm"
- assetRuleset = new AssetRuleset("Test asset definition", GROOVY, "SomeRulesCode", managerDemoSetup.smartOfficeId, false, false)
+ assetRuleset = new AssetRuleset(managerDemoSetup.smartOfficeId, "Test asset definition", GROOVY, "SomeRulesCode")
rulesetResource.createAssetRuleset(null, assetRuleset)
then: "access should be forbidden"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
index 3481283b8..224d0a9b7 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/JsonRulesTest.groovy
@@ -8,12 +8,15 @@ import org.openremote.manager.asset.AssetStorageService
import org.openremote.manager.notification.PushNotificationHandler
import org.openremote.manager.rules.RulesEngine
import org.openremote.manager.rules.RulesService
+import org.openremote.manager.rules.RulesetDeployment
import org.openremote.manager.rules.RulesetStorageService
import org.openremote.manager.rules.geofence.ORConsoleGeofenceAssetAdapter
import org.openremote.manager.setup.SetupService
import org.openremote.manager.setup.builtin.KeycloakDemoSetup
import org.openremote.manager.setup.builtin.ManagerDemoSetup
import org.openremote.model.attribute.AttributeEvent
+import org.openremote.model.calendar.CalendarEvent
+import org.openremote.model.calendar.RecurrenceRule
import org.openremote.model.console.ConsoleProvider
import org.openremote.model.console.ConsoleRegistration
import org.openremote.model.console.ConsoleResource
@@ -22,14 +25,17 @@ import org.openremote.model.notification.AbstractNotificationMessage
import org.openremote.model.notification.Notification
import org.openremote.model.notification.NotificationSendResult
import org.openremote.model.rules.Ruleset
+import org.openremote.model.rules.RulesetStatus
import org.openremote.model.rules.TenantRuleset
import org.openremote.model.value.ObjectValue
import org.openremote.test.ManagerContainerTrait
import spock.lang.Specification
import spock.util.concurrent.PollingConditions
-import static java.util.concurrent.TimeUnit.HOURS
-import static java.util.concurrent.TimeUnit.MINUTES
+import java.time.Instant
+import java.time.temporal.ChronoUnit
+
+import static java.util.concurrent.TimeUnit.*
import static org.openremote.manager.setup.builtin.ManagerDemoSetup.DEMO_RULE_STATES_CUSTOMER_A
import static org.openremote.model.Constants.KEYCLOAK_CLIENT_ID
import static org.openremote.model.attribute.AttributeType.LOCATION
@@ -77,11 +83,10 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
and: "some rules"
Ruleset ruleset = new TenantRuleset(
- "Demo Apartment - All Lights Off", Ruleset.Lang.JSON, getClass().getResource("/org/openremote/test/rules/BasicJsonRules.json").text,
- keycloakDemoSetup.tenantA.realm,
- false,
- false
- )
+ keycloakDemoSetup.tenantA.realm,
+ "Demo Apartment - All Lights Off",
+ Ruleset.Lang.JSON,
+ getClass().getResource("/org/openremote/test/rules/BasicJsonRules.json").text)
ruleset = rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running with asset states inserted"
@@ -224,7 +229,8 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
}
when: "the console sends a location update with a new location but still outside the geofence"
- def attributeEvent = new AttributeEvent(consoleRegistration.id, LOCATION.attributeName, new GeoJSONPoint(10d, 10d).toValue(), timerService.getCurrentTimeMillis())
+ def timestamp = assetStorageService.find(consoleRegistration.id, true).getAttribute(LOCATION).flatMap{it.getValueTimestamp()}.orElse(timerService.getCurrentTimeMillis())
+ def attributeEvent = new AttributeEvent(consoleRegistration.id, LOCATION.attributeName, new GeoJSONPoint(10d, 10d).toValue(), timestamp)
assetProcessingService.sendAttributeEvent(attributeEvent, AttributeEvent.Source.CLIENT)
then: "another notification should have been sent to the console (because the reset condition includes reset on valueChanges)"
@@ -236,7 +242,7 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
when: "when time advances 5 hours"
advancePseudoClock(5, HOURS, container)
- and: "the same AttributeEvent is send"
+ and: "the same AttributeEvent is sent"
assetProcessingService.sendAttributeEvent(attributeEvent, AttributeEvent.Source.CLIENT)
then: "another notification should have been sent to the console (because the reset condition includes reset on timer)"
@@ -245,7 +251,139 @@ class JsonRulesTest extends Specification implements ManagerContainerTrait {
assert targetIds[4] == consoleRegistration.id
}
+ when: "the Rules PAUSE_SCHEDULER is overridden to facilitate testing"
+ RulesEngine engine
+ RulesetDeployment deployment
+ def originalPause = RulesEngine.PAUSE_SCHEDULER
+ RulesEngine.PAUSE_SCHEDULER = {e, d ->
+ engine = e
+ deployment = d
+ long delay = d.getValidTo() - timerService.getCurrentTimeMillis()
+ // Don't actually schedule just simulate time passing and let test decide when to move on
+ advancePseudoClock(delay, MILLISECONDS, container)
+
+ }
+ def originalUnpause = RulesEngine.UNPAUSE_SCHEDULER
+ RulesEngine.UNPAUSE_SCHEDULER = {e, d ->
+ engine = e
+ deployment = d
+ long delay = d.getValidFrom() - timerService.getCurrentTimeMillis()
+ // Don't actually schedule just simulate time passing and let test decide when to move on
+ advancePseudoClock(delay, MILLISECONDS, container)
+ }
+
+ and: "a validity period is added to the ruleset (fictional times to ensure firing in sensible time within test)"
+ def version = ruleset.version
+ def validityStart = Instant.ofEpochMilli(getClockTimeOf(container)).plus(2000, ChronoUnit.MILLIS)
+ def validityEnd = Instant.ofEpochMilli(getClockTimeOf(container)).plus(4000, ChronoUnit.MILLIS)
+ def calendarEvent = new CalendarEvent(
+ Date.from(validityStart),
+ Date.from(validityEnd),
+ new RecurrenceRule(RecurrenceRule.Frequency.DAILY, 2, 3, null))
+ ruleset = rulesetStorageService.merge(ruleset.addMeta(Ruleset.META_KEY_VALIDITY,calendarEvent.toValue()))
+
+ then: "the ruleset should be redeployed and paused until 1st occurrence"
+ conditions.eventually {
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.version == version+1
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
+ }
+
+ when: "the same AttributeEvent is sent"
+ timestamp = attributeEvent.getTimestamp()+1
+ attributeEvent.setTimestamp(timestamp)
+ assetProcessingService.sendAttributeEvent(attributeEvent, AttributeEvent.Source.CLIENT)
+
+ then: "the event should have been committed to the DB"
+ conditions.eventually {
+ def console = assetStorageService.find(consoleRegistration.id, true)
+ assert console.getAttribute(LOCATION).flatMap{it.getValueTimestamp()}.orElse(0) == timestamp
+ }
+
+ and: "no notification should have been sent as outside the validity period"
+ assert notificationMessages.size() == 5
+
+ when: "the pause elapses"
+ engine.unPauseRuleset(deployment)
+
+ then: "eventually the ruleset should be unpaused (1st occurrence)"
+ conditions.eventually {
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
+ }
+
+ when: "the same AttributeEvent is sent"
+ timestamp = attributeEvent.getTimestamp()+1
+ attributeEvent.setTimestamp(timestamp)
+ assetProcessingService.sendAttributeEvent(attributeEvent, AttributeEvent.Source.CLIENT)
+
+ then: "the event should have been committed to the DB"
+ conditions.eventually {
+ def console = assetStorageService.find(consoleRegistration.id, true)
+ assert console.getAttribute(LOCATION).flatMap{it.getValueTimestamp()}.orElse(0) == timestamp
+ }
+
+ and: "another notification should have been sent as inside the validity period"
+ conditions.eventually {
+ assert notificationMessages.size() == 6
+ assert targetIds[5] == consoleRegistration.id
+ }
+
+ when: "the un-pause elapses"
+ engine.pauseRuleset(deployment)
+
+ then: "the ruleset should become paused again (until next occurrence)"
+ conditions.eventually {
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
+ }
+
+ when: "the same AttributeEvent is sent"
+ timestamp = attributeEvent.getTimestamp()+1
+ attributeEvent.setTimestamp(timestamp)
+ assetProcessingService.sendAttributeEvent(attributeEvent, AttributeEvent.Source.CLIENT)
+
+ then: "the event should have been committed to the DB"
+ conditions.eventually {
+ def console = assetStorageService.find(consoleRegistration.id, true)
+ assert console.getAttribute(LOCATION).flatMap{it.getValueTimestamp()}.orElse(0) == timestamp
+ }
+
+ and: "no notification should have been sent as outside the validity period"
+ assert notificationMessages.size() == 6
+
+ when: "the pause elapses"
+ engine.unPauseRuleset(deployment)
+
+ then: "eventually the ruleset should be unpaused (next occurrence)"
+ conditions.eventually {
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
+ }
+
+ when: "the un-pause elapses"
+ engine.pauseRuleset(deployment)
+
+ then: "the ruleset should become paused again (until last occurrence)"
+ conditions.eventually {
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.PAUSED
+ }
+
+ when: "the pause elapses"
+ engine.unPauseRuleset(deployment)
+
+ then: "eventually the ruleset should be unpaused (last occurrence)"
+ conditions.eventually {
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.DEPLOYED
+ }
+
+ when: "the un-pause elapses"
+ engine.pauseRuleset(deployment)
+
+ then: "the ruleset should expire"
+ conditions.eventually {
+ assert tenantAEngine.deployments.find{it.key == ruleset.id}.value.status == RulesetStatus.EXPIRED
+ }
+
cleanup: "stop the container"
+ RulesEngine.PAUSE_SCHEDULER = originalPause
+ RulesEngine.UNPAUSE_SCHEDULER = originalUnpause
stopContainer(container)
}
}
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy
index 419624b6e..f3a531fe1 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAllLightsOffTest.groovy
@@ -35,11 +35,10 @@ class ResidenceAllLightsOffTest extends Specification implements ManagerContaine
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - All Lights Off", Ruleset.Lang.JAVASCRIPT, getClass().getResource("/demo/rules/DemoResidenceAllLightsOff.js").text,
- managerDemoSetup.apartment2Id,
- false,
- false
- )
+ managerDemoSetup.apartment2Id,
+ "Demo Apartment - All Lights Off",
+ Ruleset.Lang.JAVASCRIPT,
+ getClass().getResource("/demo/rules/DemoResidenceAllLightsOff.js").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy
index b62cc15bb..93402148f 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceAutoVentilationTest.groovy
@@ -38,11 +38,10 @@ class ResidenceAutoVentilationTest extends Specification implements ManagerConta
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Auto Ventilation", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceAutoVentilation.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Auto Ventilation",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidenceAutoVentilation.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
index 70c6dd126..5a42ea546 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceNotifyAlarmTriggerTest.groovy
@@ -80,11 +80,9 @@ class ResidenceNotifyAlarmTriggerTest extends Specification implements ManagerCo
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Notify Alarm Trigger", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Notify Alarm Trigger",
+ Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceNotifyAlarmTrigger.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy
index 77d6d5c69..1ff3e527b 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidencePresenceDetectionTest.groovy
@@ -37,11 +37,10 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerCon
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Presence Detection with motion and CO2 sensors", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Presence Detection with motion and CO2 sensors",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -171,11 +170,10 @@ class ResidencePresenceDetectionTest extends Specification implements ManagerCon
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Presence Detection with motion sensor", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Presence Detection with motion sensor",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidencePresenceDetection.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy
index 3413ddce2..9d7c2b39b 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceSmartSwitchTest.groovy
@@ -37,11 +37,10 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Smart Start",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -167,11 +166,10 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Smart Start",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -265,11 +263,10 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Smart Start",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -387,11 +384,10 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Smart Start",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
@@ -486,11 +482,10 @@ class ResidenceSmartSwitchTest extends Specification implements ManagerContainer
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Smart Start", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Smart Start",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidenceSmartSwitch.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"
diff --git a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy
index 9d8955f81..fdb6140cb 100644
--- a/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/rules/residence/ResidenceVacationModeTest.groovy
@@ -40,11 +40,10 @@ class ResidenceVacationModeTest extends Specification implements ManagerContaine
and: "some rules"
Ruleset ruleset = new AssetRuleset(
- "Demo Apartment - Vacation Mode", Ruleset.Lang.GROOVY, getClass().getResource("/demo/rules/DemoResidenceVacationMode.groovy").text,
- managerDemoSetup.apartment1Id,
- false,
- false
- )
+ managerDemoSetup.apartment1Id,
+ "Demo Apartment - Vacation Mode",
+ Ruleset.Lang.GROOVY,
+ getClass().getResource("/demo/rules/DemoResidenceVacationMode.groovy").text)
rulesetStorageService.merge(ruleset)
expect: "the rule engines to become available and be running"