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

nowaterman · Dec 29, 2020 · 8c9a883 · 8c9a883
1 parent 047b6ba
commit 8c9a883
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...db/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java b/...db/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java
@@ -145,7 +145,7 @@ private static boolean toBoolean(@Nullable Object object) {
         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/...rc/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java b/...rc/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java
@@ -78,12 +78,15 @@ public void convertDecimalToState(String number) {
     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