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
Minor update (switch ValuePredicate to abstract class simply to work with jsonschema generator)
Rich Turner609ec4ce64d0
diff --git a/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.java b/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.javaindex 426b986bc..28bdb4843 100644--- a/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/ArrayPredicate.java@@ -40,7 +40,7 @@ import java.util.function.Supplier;* There is an implicit 'and' between each specified condition; the negation is applied once all the criteria are* evaluated.*/-public class ArrayPredicate implements ValuePredicate {+public class ArrayPredicate extends ValuePredicate {public static final String name = "array";public boolean negated;diff --git a/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.java b/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.javaindex e70cf9c7c..345822bdf 100644--- a/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/BooleanPredicate.java@@ -24,7 +24,7 @@ import org.openremote.model.value.Values;import java.util.function.Predicate;import java.util.function.Supplier;-public class BooleanPredicate implements ValuePredicate {+public class BooleanPredicate extends ValuePredicate {public static final String name = "boolean";public boolean value;diff --git a/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java b/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.javaindex 2f9d7274a..a6aff4034 100644--- a/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/CalendarEventPredicate.java@@ -34,7 +34,7 @@ import java.util.function.Supplier;* Can be applied to {@link org.openremote.model.attribute.Attribute}s of type* {@link ValueType#CALENDAR_EVENT}.*/-public class CalendarEventPredicate implements ValuePredicate {+public class CalendarEventPredicate extends ValuePredicate {public static final String name = "calendar-event";public Date timestamp;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 8911f9d0c..6db1ff1c0 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@@ -33,7 +33,7 @@ import java.util.function.Supplier;* (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 class DateTimePredicate extends ValuePredicate {public static final String name = "datetime";public String value; // Sliding window value as ISO8601 duration e.g. PT1H or fixed date time in ISO 8601diff --git a/model/src/main/java/org/openremote/model/query/filter/GeofencePredicate.java b/model/src/main/java/org/openremote/model/query/filter/GeofencePredicate.javaindex 96b3233b7..5f277072f 100644--- a/model/src/main/java/org/openremote/model/query/filter/GeofencePredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/GeofencePredicate.java@@ -21,7 +21,7 @@ package org.openremote.model.query.filter;import com.fasterxml.jackson.annotation.JsonIgnore;-public abstract class GeofencePredicate implements ValuePredicate {+public abstract class GeofencePredicate extends ValuePredicate {public boolean negated;diff --git a/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.java b/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.javaindex 8106c321e..f8836f1ef 100644--- a/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/NumberPredicate.java@@ -26,7 +26,7 @@ import org.openremote.model.value.Values;import java.util.function.Predicate;import java.util.function.Supplier;-public class NumberPredicate implements ValuePredicate {+public class NumberPredicate extends ValuePredicate {public static final String name = "number";public Number value;diff --git a/model/src/main/java/org/openremote/model/query/filter/StringPredicate.java b/model/src/main/java/org/openremote/model/query/filter/StringPredicate.javaindex cc153f0ca..dbabe3576 100644--- a/model/src/main/java/org/openremote/model/query/filter/StringPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/StringPredicate.java@@ -29,7 +29,7 @@ import java.util.Objects;import java.util.function.Predicate;import java.util.function.Supplier;-public class StringPredicate implements ValuePredicate {+public class StringPredicate extends ValuePredicate {public static final String name = "string";public AssetQuery.Match match = AssetQuery.Match.EXACT;diff --git a/model/src/main/java/org/openremote/model/query/filter/ValueEmptyPredicate.java b/model/src/main/java/org/openremote/model/query/filter/ValueEmptyPredicate.javaindex 2dadaf028..409b5f6e0 100644--- a/model/src/main/java/org/openremote/model/query/filter/ValueEmptyPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/ValueEmptyPredicate.java@@ -23,7 +23,7 @@ import java.util.Objects;import java.util.function.Predicate;import java.util.function.Supplier;-public class ValueEmptyPredicate implements ValuePredicate {+public class ValueEmptyPredicate extends ValuePredicate {public static final String name = "value-empty";diff --git a/model/src/main/java/org/openremote/model/query/filter/ValueNotEmptyPredicate.java b/model/src/main/java/org/openremote/model/query/filter/ValueNotEmptyPredicate.javaindex d14d546ae..53bd9e4b5 100644--- a/model/src/main/java/org/openremote/model/query/filter/ValueNotEmptyPredicate.java+++ b/model/src/main/java/org/openremote/model/query/filter/ValueNotEmptyPredicate.java@@ -23,7 +23,7 @@ import java.util.Objects;import java.util.function.Predicate;import java.util.function.Supplier;-public class ValueNotEmptyPredicate implements ValuePredicate {+public class ValueNotEmptyPredicate extends ValuePredicate {public static final String name = "value-not-empty";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.javaindex 8eb68213b..7eec30040 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@@ -43,11 +43,11 @@ import java.util.function.Supplier;use = JsonTypeInfo.Id.NAME,property = "predicateType")-public interface ValuePredicate extends Serializable {+public abstract class ValuePredicate implements Serializable {- static Predicate<Object> asPredicateOrTrue(Supplier<Long> currentMillisSupplier, ValuePredicate valuePredicate) {+ public static Predicate<Object> asPredicateOrTrue(Supplier<Long> currentMillisSupplier, ValuePredicate valuePredicate) {return obj -> Optional.ofNullable(valuePredicate).map(vp -> vp.asPredicate(currentMillisSupplier).test(obj)).orElse(true);}- Predicate<Object> asPredicate(Supplier<Long> currentMillisSupplier);+ public abstract Predicate<Object> asPredicate(Supplier<Long> currentMillisSupplier);}