100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
DateTimePredicate now requires ISO8601 datetime strings, also includes cleanup of several asset query classes
Rich Turnere83dcbdd3841
diff --git a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.javaindex b2ae5f621..95701a712 100644--- a/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java+++ b/manager/src/main/java/org/openremote/manager/rules/AssetQueryPredicate.java@@ -22,6 +22,8 @@ package org.openremote.manager.rules;import com.vividsolutions.jts.geom.Coordinate;import com.vividsolutions.jts.geom.Envelope;import org.geotools.referencing.GeodeticCalculator;+import org.joda.time.format.DateTimeFormatter;+import org.joda.time.format.ISODateTimeFormat;import org.openremote.container.timer.TimerService;import org.openremote.manager.asset.AssetStorageService;import org.openremote.model.attribute.Meta;@@ -34,14 +36,11 @@ import org.openremote.model.query.filter.*;import org.openremote.model.rules.AssetState;import org.openremote.model.rules.json.RuleCondition;import org.openremote.model.rules.json.RuleOperator;-import org.openremote.model.rules.json.RuleTrigger;import org.openremote.model.util.Pair;import org.openremote.model.util.TimeUtil;import org.openremote.model.value.Value;import org.openremote.model.value.Values;-import java.text.ParseException;-import java.text.SimpleDateFormat;import java.util.*;import java.util.function.Predicate;import java.util.function.Supplier;@@ -58,6 +57,7 @@ public class AssetQueryPredicate implements Predicate<AssetState> {final protected NewAssetQuery query;final protected TimerService timerService;final protected AssetStorageService assetStorageService;+ static final protected DateTimeFormatter dateFormatter = ISODateTimeFormat.dateTimeNoMillis();// TODO: Remove this ctor once asset queries merged@SuppressWarnings("unchecked")@@ -498,17 +498,17 @@ public class AssetQueryPredicate implements Predicate<AssetState> {if (TimeUtil.isTimeDuration(dateTimePredicate.value)) {from = currentMillis + TimeUtil.parseTimeDuration(dateTimePredicate.value);} else {- from = new SimpleDateFormat(dateTimePredicate.dateFormat).parse(dateTimePredicate.value).getTime();+ from = dateFormatter.parseMillis(dateTimePredicate.value);}if (dateTimePredicate.operator == BaseAssetQuery.Operator.BETWEEN) {if (TimeUtil.isTimeDuration(dateTimePredicate.rangeValue)) {to = currentMillis + TimeUtil.parseTimeDuration(dateTimePredicate.rangeValue);} else {- to = new SimpleDateFormat(dateTimePredicate.dateFormat).parse(dateTimePredicate.rangeValue).getTime();+ to = dateFormatter.parseMillis(dateTimePredicate.rangeValue);}}- } catch (ParseException e) {+ } catch (IllegalArgumentException e) {from = null;to = null;}diff --git a/model/src/main/java/org/openremote/model/query/BaseAssetQuery.java b/model/src/main/java/org/openremote/model/query/BaseAssetQuery.javaindex ab8e0d90f..d7ef6cf1d 100644--- a/model/src/main/java/org/openremote/model/query/BaseAssetQuery.java+++ b/model/src/main/java/org/openremote/model/query/BaseAssetQuery.java@@ -348,6 +348,11 @@ public class BaseAssetQuery<CHILD extends BaseAssetQuery<CHILD>> {return (CHILD) this;}+ public CHILD ids(String...ids) {+ this.ids = ids != null ? Arrays.asList(ids) : null;+ return (CHILD) this;+ }+public CHILD ids(Collection<String> ids) {this.ids = ids != null ? new ArrayList<>(ids) : null;return (CHILD) this;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.javaindex d23a42c2c..aa86fb960 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@@ -22,6 +22,7 @@ package org.openremote.model.query.filter;import org.openremote.model.value.ObjectValue;import org.openremote.model.value.Values;+// TODO: Incorporate meta predicates herepublic class AttributePredicate {public StringPredicate name;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.javaindex 7db256f47..0ea2d04bf 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@@ -23,13 +23,17 @@ import org.openremote.model.query.BaseAssetQuery;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.+ */public class DateTimePredicate implements ValuePredicate {public static final String name = "datetime";public String value; // Sliding window value e.g. 1h or fixed date timepublic String rangeValue; // Sliding window value e.g. 1h or fixed date time (used as upper bound when Operator.BETWEEN)public BaseAssetQuery.Operator operator = BaseAssetQuery.Operator.EQUALS;- public String dateFormat = "yyyy-MM-dd HH:mm:ss"; // SimpleDateFormatpublic DateTimePredicate() {}@@ -48,9 +52,6 @@ public class DateTimePredicate implements ValuePredicate {public static DateTimePredicate fromObjectValue(ObjectValue objectValue) {DateTimePredicate dateTimePredicate = new DateTimePredicate();- objectValue.getString("dateFormat").ifPresent(format -> {- dateTimePredicate.dateFormat = format;- });objectValue.getString("value").ifPresent(value -> {dateTimePredicate.value = value;});@@ -68,11 +69,6 @@ public class DateTimePredicate implements ValuePredicate {return this;}- public DateTimePredicate dateFormat(String dateFormat) {- this.dateFormat = dateFormat;- return this;- }-public DateTimePredicate value(String value) {this.value = value;return this;@@ -87,7 +83,6 @@ public class DateTimePredicate implements ValuePredicate {public ObjectValue toModelValue() {ObjectValue objectValue = Values.createObject();objectValue.put("predicateType", name);- objectValue.put("dateFormat", Values.create(dateFormat));objectValue.put("value", Values.create(value));objectValue.put("rangeValue", Values.create(rangeValue));objectValue.put("operator", Values.create(operator.toString()));@@ -100,7 +95,6 @@ public class DateTimePredicate implements ValuePredicate {"value='" + value + '\'' +", rangeValue='" + rangeValue + '\'' +", operator =" + operator +- ", dateFormat='" + dateFormat + '\'' +'}';}}diff --git a/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.java b/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.javaindex fc8e1942e..a1c9c26a8 100644--- a/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/ObjectValueKeyPredicate.java@@ -19,6 +19,8 @@*/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;@@ -32,7 +34,8 @@ public class ObjectValueKeyPredicate implements ValuePredicate {key = hasKey;}- public ObjectValueKeyPredicate(String hasKey, boolean negate) {+ @JsonCreator+ public ObjectValueKeyPredicate(@JsonProperty("key") String hasKey, @JsonProperty("negated") boolean negate) {key = hasKey;negated = negate;}diff --git a/model/src/main/java/org/openremote/model/rules/json/RuleActionTarget.java b/model/src/main/java/org/openremote/model/rules/json/RuleActionTarget.javaindex 5f6e7e188..7b1d70882 100644--- a/model/src/main/java/org/openremote/model/rules/json/RuleActionTarget.java+++ b/model/src/main/java/org/openremote/model/rules/json/RuleActionTarget.java@@ -19,7 +19,7 @@*/package org.openremote.model.rules.json;-import org.openremote.model.query.AssetQuery;+import org.openremote.model.query.NewAssetQuery;import org.openremote.model.query.UserQuery;/**@@ -32,6 +32,6 @@ import org.openremote.model.query.UserQuery;*/public class RuleActionTarget {public String ruleTriggerTag;- public AssetQuery assets;+ public NewAssetQuery assets;public UserQuery users;}diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovyindex 5e952b6e6..a3432e362 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetQueryTest.groovy@@ -870,8 +870,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {.attributeValue("openingDate",new DateTimePredicate(rangeStart.format(ISO_LOCAL_DATE_TIME), rangeEnd.format(ISO_LOCAL_DATE_TIME))- .operator(Operator.BETWEEN)- .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ .operator(Operator.BETWEEN)))@@ -885,8 +884,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm)).attributeValue("openingDate",- new DateTimePredicate(Operator.GREATER_THAN, rangeStart.format(ISO_LOCAL_DATE_TIME))- .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ new DateTimePredicate(Operator.GREATER_THAN, rangeStart.format(ISO_LOCAL_DATE_TIME))))@@ -900,8 +898,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm)).attributeValue("openingDate",- new DateTimePredicate(Operator.LESS_THAN, rangeEnd.format(ISO_LOCAL_DATE_TIME))- .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ new DateTimePredicate(Operator.LESS_THAN, rangeEnd.format(ISO_LOCAL_DATE_TIME))))@@ -917,8 +914,7 @@ class AssetQueryTest extends Specification implements ManagerContainerTrait {.tenant(new TenantPredicate(keycloakDemoSetup.masterTenant.realm)).attributeValue("openingDate",- new DateTimePredicate(Operator.EQUALS, rangeStart.format(ISO_LOCAL_DATE_TIME))- .dateFormat("yyyy-MM-dd'T'HH:mm:ss"))+ new DateTimePredicate(Operator.EQUALS, rangeStart.format(ISO_LOCAL_DATE_TIME))))