[persistence] Handle null value for relative & inverted props o…

…f filters (openhab#3727) Signed-off-by: Florian Hotze <[email protected]>
lolodomo · Jul 25, 2023 · f5a0b37 · f5a0b37
1 parent e1741cf
commit f5a0b37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/...ersistence/src/main/java/org/openhab/core/persistence/filter/PersistenceEqualsFilter.java b/...ersistence/src/main/java/org/openhab/core/persistence/filter/PersistenceEqualsFilter.java
@@ -15,6 +15,7 @@
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.core.items.Item;
 
 /**
@@ -29,10 +30,10 @@ public class PersistenceEqualsFilter extends PersistenceFilter {
     private final Collection<String> values;
     private final boolean inverted;
 
-    public PersistenceEqualsFilter(String name, Collection<String> values, boolean inverted) {
+    public PersistenceEqualsFilter(String name, Collection<String> values, @Nullable Boolean inverted) {
         super(name);
         this.values = values;
-        this.inverted = inverted;
+        this.inverted = (inverted == null) ? false : inverted;
     }
 
     public Collection<String> getValues() {

diff --git a/...rsistence/src/main/java/org/openhab/core/persistence/filter/PersistenceIncludeFilter.java b/...rsistence/src/main/java/org/openhab/core/persistence/filter/PersistenceIncludeFilter.java
@@ -40,12 +40,12 @@ public class PersistenceIncludeFilter extends PersistenceFilter {
     private final boolean inverted;
 
     public PersistenceIncludeFilter(String name, BigDecimal lower, BigDecimal upper, @Nullable String unit,
-            boolean inverted) {
+            @Nullable Boolean inverted) {
         super(name);
         this.lower = lower;
         this.upper = upper;
         this.unit = (unit == null) ? "" : unit;
-        this.inverted = inverted;
+        this.inverted = (inverted == null) ? false : inverted;
     }
 
     public BigDecimal getLower() {

diff --git a/...istence/src/main/java/org/openhab/core/persistence/filter/PersistenceThresholdFilter.java b/...istence/src/main/java/org/openhab/core/persistence/filter/PersistenceThresholdFilter.java
@@ -48,11 +48,12 @@ public class PersistenceThresholdFilter extends PersistenceFilter {
 
     private final transient Map<String, State> valueCache = new HashMap<>();
 
-    public PersistenceThresholdFilter(String name, BigDecimal value, @Nullable String unit, boolean relative) {
+    public PersistenceThresholdFilter(String name, BigDecimal value, @Nullable String unit,
+            @Nullable Boolean relative) {
         super(name);
         this.value = value;
         this.unit = (unit == null) ? "" : unit;
-        this.relative = relative;
+        this.relative = (relative == null) ? false : relative;
     }
 
     public BigDecimal getValue() {