public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Signed-off-by: Stefan Triller <github@stefantriller.de>
This commit is contained in:
t2000 2020-12-29 14:21:33 +01:00 committed by GitHub
parent 6da56da7a8
commit bf2d40c5bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtils.java
View File

@ -145,7 +145,7 @@ public class InfluxDBStateConvertUtils {
if (object instanceof Boolean) { if (object instanceof Boolean) {
return (Boolean) object; return (Boolean) object;
} else if (object != null) { } else if (object != null) {
if ("1".equals(object)) { if ("1".equals(object) || "1.0".equals(object)) {
return true; return true;
} else { } else {
return Boolean.valueOf(String.valueOf(object)); return Boolean.valueOf(String.valueOf(object));

3
bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/InfluxDBStateConvertUtilsTest.java
View File

@ -78,12 +78,15 @@ public class InfluxDBStateConvertUtilsTest {
public void convertOnOffToState() { public void convertOnOffToState() {
boolean val1 = true; boolean val1 = true;
int val2 = 1; int val2 = 1;
double val3 = 1.0;
SwitchItem onOffItem = new SwitchItem("name"); SwitchItem onOffItem = new SwitchItem("name");
ContactItem contactItem = new ContactItem("name"); ContactItem contactItem = new ContactItem("name");
assertThat(InfluxDBStateConvertUtils.objectToState(val1, onOffItem), equalTo(OnOffType.ON)); assertThat(InfluxDBStateConvertUtils.objectToState(val1, onOffItem), equalTo(OnOffType.ON));
assertThat(InfluxDBStateConvertUtils.objectToState(val2, 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(val1, contactItem), equalTo(OpenClosedType.OPEN));
assertThat(InfluxDBStateConvertUtils.objectToState(val2, contactItem), equalTo(OpenClosedType.OPEN)); assertThat(InfluxDBStateConvertUtils.objectToState(val2, contactItem), equalTo(OpenClosedType.OPEN));
assertThat(InfluxDBStateConvertUtils.objectToState(val3, contactItem), equalTo(OpenClosedType.OPEN));
} }
@Test @Test