From f5a0b37b3dfc2bc188c6f80dca96b91a0fd72b6e Mon Sep 17 00:00:00 2001
From: Florian Hotze <florianh_dev@icloud.com>
Date: Tue, 25 Jul 2023 21:07:24 +0200
Subject: [PATCH] [persistence] Handle `null` value for `relative` & `inverted`
 props of filters (#3727)

Signed-off-by: Florian Hotze <florianh_dev@icloud.com>
---
 .../core/persistence/filter/PersistenceEqualsFilter.java     | 5 +++--
 .../core/persistence/filter/PersistenceIncludeFilter.java    | 4 ++--
 .../core/persistence/filter/PersistenceThresholdFilter.java  | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceEqualsFilter.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceEqualsFilter.java
index fdceb2863a..45ccbc69c2 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceEqualsFilter.java
+++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceEqualsFilter.java
@@ -15,6 +15,7 @@ package org.openhab.core.persistence.filter;
 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/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceIncludeFilter.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceIncludeFilter.java
index 8b3181a38a..2ca7fc3647 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceIncludeFilter.java
+++ b/bundles/org.openhab.core.persistence/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/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceThresholdFilter.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceThresholdFilter.java
index 1a15070e93..b841c0548b 100644
--- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceThresholdFilter.java
+++ b/bundles/org.openhab.core.persistence/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() {