[influxdb] Treat a stored 1 AND 1.0 as true (#9545)

Signed-off-by: Stefan Triller <github@stefantriller.de>

diff --git a/bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java b/bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java
index 62f096fad398d790f16e59bacdf53a2710b542ce..bc191e9c9b3a93db16b7790d08d8adfd43ee514a 100644 (file)
--- a/bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java
+++ b/bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java
@@ -145,7 +145,7 @@ public class InfluxDBStateConvertUtils {
         if (object instanceof Boolean) {
             return (Boolean) object;
         } else if (object != null) {
-            if ("1".equals(object)) {
+            if ("1".equals(object) || "1.0".equals(object)) {
                 return true;
             } else {
                 return Boolean.valueOf(String.valueOf(object));

diff --git a/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java b/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java
index d44032ddca6dd775dc7c0ec8736c38881409be8d..c71e4b3aec0dba76304560bf1deac80d299c6533 100644 (file)
--- a/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java
+++ b/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java
@@ -78,12 +78,15 @@ public class InfluxDBStateConvertUtilsTest {
     public void convertOnOffToState() {
         boolean val1 = true;
         int val2 = 1;
+        double val3 = 1.0;
         SwitchItem onOffItem = new SwitchItem("name");
         ContactItem contactItem = new ContactItem("name");
         assertThat(InfluxDBStateConvertUtils.objectToState(val1, onOffItem), equalTo(OnOffType.ON));
         assertThat(InfluxDBStateConvertUtils.objectToState(val2, onOffItem), equalTo(OnOffType.ON));
+        assertThat(InfluxDBStateConvertUtils.objectToState(val3, onOffItem), equalTo(OnOffType.ON));
         assertThat(InfluxDBStateConvertUtils.objectToState(val1, contactItem), equalTo(OpenClosedType.OPEN));
         assertThat(InfluxDBStateConvertUtils.objectToState(val2, contactItem), equalTo(OpenClosedType.OPEN));
+        assertThat(InfluxDBStateConvertUtils.objectToState(val3, contactItem), equalTo(OpenClosedType.OPEN));
     }
 
     @Test