Update Binary Input converter

Signed-off-by: Chris Jackson <[email protected]>
openhab · Dec 25, 2019 · 07e942e · 07e942e
1 parent b5b1ee1
commit 07e942e
Show file tree

Hide file tree

Showing 24 changed files with 49 additions and 80 deletions.
diff --git a/...ava/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterAtmosphericPressure.java b/...ava/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterAtmosphericPressure.java
@@ -19,8 +19,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.measure.quantity.Pressure;
 
@@ -56,7 +54,7 @@ public class ZigBeeConverterAtmosphericPressure extends ZigBeeBaseChannelConvert
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclPressureMeasurementCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclPressureMeasurementCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/.../main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryAlarm.java b/.../main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryAlarm.java
@@ -19,8 +19,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.library.types.StringType;
 import org.eclipse.smarthome.core.thing.Channel;
@@ -74,7 +72,7 @@ public class ZigBeeConverterBatteryAlarm extends ZigBeeBaseChannelConverter impl
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclPowerConfigurationCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclPowerConfigurationCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...ain/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryPercent.java b/...ain/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryPercent.java
@@ -17,8 +17,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.library.types.DecimalType;
 import org.eclipse.smarthome.core.thing.Channel;
@@ -49,7 +47,7 @@ public class ZigBeeConverterBatteryPercent extends ZigBeeBaseChannelConverter im
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclPowerConfigurationCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclPowerConfigurationCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...ain/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryVoltage.java b/...ain/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBatteryVoltage.java
@@ -16,8 +16,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.measure.quantity.ElectricPotential;
 
@@ -51,7 +49,7 @@ public class ZigBeeConverterBatteryVoltage extends ZigBeeBaseChannelConverter im
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclPowerConfigurationCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclPowerConfigurationCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBinaryInput.java b/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterBinaryInput.java
@@ -12,12 +12,10 @@
  */
 package org.openhab.binding.zigbee.internal.converter;
 
-import com.zsmartsystems.zigbee.CommandResult;
-import com.zsmartsystems.zigbee.ZigBeeEndpoint;
-import com.zsmartsystems.zigbee.zcl.ZclAttribute;
-import com.zsmartsystems.zigbee.zcl.ZclAttributeListener;
-import com.zsmartsystems.zigbee.zcl.clusters.ZclBinaryInputBasicCluster;
-import com.zsmartsystems.zigbee.zcl.protocol.ZclClusterType;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+
 import org.eclipse.smarthome.core.library.types.OnOffType;
 import org.eclipse.smarthome.core.thing.Channel;
 import org.eclipse.smarthome.core.thing.ThingUID;
@@ -27,7 +25,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.ExecutionException;
+import com.zsmartsystems.zigbee.CommandResult;
+import com.zsmartsystems.zigbee.ZigBeeEndpoint;
+import com.zsmartsystems.zigbee.zcl.ZclAttribute;
+import com.zsmartsystems.zigbee.zcl.ZclAttributeListener;
+import com.zsmartsystems.zigbee.zcl.clusters.ZclBinaryInputBasicCluster;
+import com.zsmartsystems.zigbee.zcl.protocol.ZclClusterType;
 
 /**
  * Converter for the binary input sensor.
@@ -40,6 +43,16 @@ public class ZigBeeConverterBinaryInput extends ZigBeeBaseChannelConverter imple
 
     private ZclBinaryInputBasicCluster binaryInputCluster;
 
+    @Override
+    public Set<Integer> getImplementedClientClusters() {
+        return Collections.singleton(ZclBinaryInputBasicCluster.CLUSTER_ID);
+    }
+
+    @Override
+    public Set<Integer> getImplementedServerClusters() {
+        return Collections.emptySet();
+    }
+
     @Override
     public boolean initializeDevice() {
         logger.debug("{}: Initialising device binary input cluster", endpoint.getIeeeAddress());
@@ -68,7 +81,8 @@ public boolean initializeDevice() {
 
     @Override
     public boolean initializeConverter() {
-        binaryInputCluster = (ZclBinaryInputBasicCluster) endpoint.getInputCluster(ZclBinaryInputBasicCluster.CLUSTER_ID);
+        binaryInputCluster = (ZclBinaryInputBasicCluster) endpoint
+                .getInputCluster(ZclBinaryInputBasicCluster.CLUSTER_ID);
         if (binaryInputCluster == null) {
             logger.error("{}: Error opening binary input cluster", endpoint.getIeeeAddress());
             return false;
@@ -101,8 +115,8 @@ public Channel getChannel(ThingUID thingUID, ZigBeeEndpoint endpoint) {
                 .create(createChannelUID(thingUID, endpoint, ZigBeeBindingConstants.CHANNEL_NAME_BINARYINPUT),
                         ZigBeeBindingConstants.ITEM_TYPE_SWITCH)
                 .withType(ZigBeeBindingConstants.CHANNEL_BINARYINPUT)
-                .withLabel(ZigBeeBindingConstants.CHANNEL_LABEL_BINARYINPUT)
-                .withProperties(createProperties(endpoint)).build();
+                .withLabel(ZigBeeBindingConstants.CHANNEL_LABEL_BINARYINPUT).withProperties(createProperties(endpoint))
+                .build();
     }
 
     @Override

diff --git a/...n/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterColorTemperature.java b/...n/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterColorTemperature.java
@@ -17,8 +17,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.library.types.OnOffType;
 import org.eclipse.smarthome.core.library.types.PercentType;
@@ -64,7 +62,7 @@ public class ZigBeeConverterColorTemperature extends ZigBeeBaseChannelConverter
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclColorControlCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclColorControlCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/.../src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterDoorLock.java b/.../src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterDoorLock.java
@@ -15,8 +15,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.library.types.OnOffType;
 import org.eclipse.smarthome.core.thing.Channel;
@@ -49,7 +47,7 @@ public class ZigBeeConverterDoorLock extends ZigBeeBaseChannelConverter implemen
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclDoorLockCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclDoorLockCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...rc/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterFanControl.java b/...rc/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterFanControl.java
@@ -15,8 +15,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.library.types.DecimalType;
 import org.eclipse.smarthome.core.library.types.OnOffType;
@@ -57,7 +55,7 @@ public class ZigBeeConverterFanControl extends ZigBeeBaseChannelConverter implem
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclFanControlCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclFanControlCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterIlluminance.java b/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterIlluminance.java
@@ -18,8 +18,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.smarthome.config.core.Configuration;
@@ -60,7 +58,7 @@ public class ZigBeeConverterIlluminance extends ZigBeeBaseChannelConverter imple
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclIlluminanceMeasurementCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclIlluminanceMeasurementCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...n/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeasurementPower.java b/...n/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeasurementPower.java
@@ -16,8 +16,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.measure.quantity.Power;
 
@@ -53,7 +51,7 @@ public class ZigBeeConverterMeasurementPower extends ZigBeeBaseChannelConverter
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclElectricalMeasurementCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclElectricalMeasurementCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...a/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeasurementRmsCurrent.java b/...a/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeasurementRmsCurrent.java
@@ -16,8 +16,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.measure.quantity.ElectricCurrent;
 
@@ -54,7 +52,7 @@ public class ZigBeeConverterMeasurementRmsCurrent extends ZigBeeBaseChannelConve
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclElectricalMeasurementCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclElectricalMeasurementCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...a/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeasurementRmsVoltage.java b/...a/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterMeasurementRmsVoltage.java
@@ -16,8 +16,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javax.measure.quantity.ElectricPotential;
 
@@ -54,7 +52,7 @@ public class ZigBeeConverterMeasurementRmsVoltage extends ZigBeeBaseChannelConve
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclElectricalMeasurementCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclElectricalMeasurementCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterOccupancy.java b/...src/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterOccupancy.java
@@ -15,8 +15,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.library.types.OnOffType;
 import org.eclipse.smarthome.core.thing.Channel;
@@ -47,7 +45,7 @@ public class ZigBeeConverterOccupancy extends ZigBeeBaseChannelConverter impleme
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclOccupancySensingCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclOccupancySensingCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...n/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterRelativeHumidity.java b/...n/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterRelativeHumidity.java
@@ -16,8 +16,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.library.types.DecimalType;
 import org.eclipse.smarthome.core.thing.Channel;
@@ -48,7 +46,7 @@ public class ZigBeeConverterRelativeHumidity extends ZigBeeBaseChannelConverter
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclRelativeHumidityMeasurementCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclRelativeHumidityMeasurementCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterSwitchOnoff.java b/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterSwitchOnoff.java
@@ -13,6 +13,7 @@
 package org.openhab.binding.zigbee.internal.converter;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -21,8 +22,6 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.smarthome.config.core.Configuration;
@@ -81,12 +80,12 @@ public class ZigBeeConverterSwitchOnoff extends ZigBeeBaseChannelConverter
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclOnOffCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclOnOffCluster.CLUSTER_ID);
     }
 
     @Override
     public Set<Integer> getImplementedServerClusters() {
-        return Stream.of(ZclOnOffCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclOnOffCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterTemperature.java b/...c/main/java/org/openhab/binding/zigbee/internal/converter/ZigBeeConverterTemperature.java
@@ -15,8 +15,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.thing.Channel;
 import org.eclipse.smarthome.core.thing.ThingUID;
@@ -46,7 +44,7 @@ public class ZigBeeConverterTemperature extends ZigBeeBaseChannelConverter imple
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclTemperatureMeasurementCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclTemperatureMeasurementCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/.../openhab/binding/zigbee/internal/converter/ZigBeeConverterThermostatLocalTemperature.java b/.../openhab/binding/zigbee/internal/converter/ZigBeeConverterThermostatLocalTemperature.java
@@ -15,8 +15,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.thing.Channel;
 import org.eclipse.smarthome.core.thing.ThingUID;
@@ -49,7 +47,7 @@ public class ZigBeeConverterThermostatLocalTemperature extends ZigBeeBaseChannel
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclThermostatCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclThermostatCluster.CLUSTER_ID);
     }
 
     @Override

diff --git a/...g/openhab/binding/zigbee/internal/converter/ZigBeeConverterThermostatOccupiedCooling.java b/...g/openhab/binding/zigbee/internal/converter/ZigBeeConverterThermostatOccupiedCooling.java
@@ -15,8 +15,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.smarthome.core.thing.Channel;
 import org.eclipse.smarthome.core.thing.ThingUID;
@@ -51,7 +49,7 @@ public class ZigBeeConverterThermostatOccupiedCooling extends ZigBeeBaseChannelC
 
     @Override
     public Set<Integer> getImplementedClientClusters() {
-        return Stream.of(ZclThermostatCluster.CLUSTER_ID).collect(Collectors.toSet());
+        return Collections.singleton(ZclThermostatCluster.CLUSTER_ID);
     }
 
     @Override