Address review comments

Signed-off-by: Stefan Triller <[email protected]>
openhab · May 23, 2020 · bde3d2b · bde3d2b
1 parent bf0810c
commit bde3d2b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 28 deletions.
diff --git a/bundles/org.openhab.binding.novafinedust/README.md b/bundles/org.openhab.binding.novafinedust/README.md
@@ -31,7 +31,7 @@ A full overview about the parameters of the `SDS011` thing is given in the follo
 
 | parameter name    | mandatory | description                                                                           |
 |-------------------|-----------|---------------------------------------------------------------------------------------|
-| port              | yes       | the port the sensor is connected to, i.e. /detv/ttyUSB0.                              |
+| port              | yes       | the port the sensor is connected to, i.e. /dev/ttyUSB0.                              |
 | reporting         | yes       | whether the reporting mode (value=true) or polling mode should be used.               |
 | reportingInterval | no        | the time in minutes between reportings from the sensor (default=1, min=0, max=30).    |
 | pollingInterval   | no        | the time in seconds between data polls from the device. (default=10, min=3, max=3600) |

diff --git a/bundles/org.openhab.binding.novafinedust/pom.xml b/bundles/org.openhab.binding.novafinedust/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openhab.addons.bundles</groupId>
     <artifactId>org.openhab.addons.reactor.bundles</artifactId>
-    <version>2.5.5-SNAPSHOT</version>
+    <version>2.5.6-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.binding.novafinedust</artifactId>

diff --git a/...g.novafinedust/src/main/java/org/openhab/binding/novafinedust/internal/SDS011Handler.java b/...g.novafinedust/src/main/java/org/openhab/binding/novafinedust/internal/SDS011Handler.java
@@ -15,8 +15,6 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.time.ZonedDateTime;
-import java.time.chrono.ChronoZonedDateTime;
-import java.time.temporal.Temporal;
 import java.util.TooManyListenersException;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -61,11 +59,11 @@ public class SDS011Handler extends BaseThingHandler {
     private @Nullable ScheduledFuture<?> pollingJob;
     private @Nullable ScheduledFuture<?> connectionMonitor;
 
-    private Temporal lastCommunication = ZonedDateTime.now();
+    private ZonedDateTime lastCommunication = ZonedDateTime.now();
 
     // initialize timeBetweenDataShouldArrive with a large number
     private Duration timeBetweenDataShouldArrive = Duration.ofDays(1);
-    private final Duration dataCanBeLateTollerance = Duration.ofSeconds(5);
+    private final Duration dataCanBeLateTolerance = Duration.ofSeconds(5);
 
     public SDS011Handler(Thing thing, SerialPortManager serialPortManager) {
         super(thing);
@@ -159,20 +157,6 @@ private boolean validateConfiguration() {
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.CONFIGURATION_ERROR, "Port must be set!");
             return false;
         }
-
-        if (config.reporting) {
-            if (config.reportingInterval < 0 || config.reportingInterval > 30) {
-                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.CONFIGURATION_ERROR,
-                        "Reporting interval has to be between 0 and 30 minutes");
-                return false;
-            }
-        } else {
-            if (config.pollingInterval < 3 || config.pollingInterval > 3600) {
-                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.CONFIGURATION_ERROR,
-                        "Polling interval has to be between 3 and 3600 seconds");
-                return false;
-            }
-        }
         return true;
     }
 
@@ -218,18 +202,18 @@ public void updateChannels(SensorMeasuredDataReply sensorData) {
 
     private void verifyIfStillConnected() {
         ZonedDateTime now = ZonedDateTime.now();
-        Temporal lastData = lastCommunication.plus(timeBetweenDataShouldArrive).plus(dataCanBeLateTollerance);
-        if (now.isAfter((ChronoZonedDateTime<?>) lastData)) {
+        ZonedDateTime lastData = lastCommunication.plus(timeBetweenDataShouldArrive).plus(dataCanBeLateTolerance);
+        if (now.isAfter(lastData)) {
             logger.debug("Check Alive timer: Timeout: lastCommunication={}, interval={}, tollerance={}",
-                    lastCommunication, timeBetweenDataShouldArrive, dataCanBeLateTollerance);
+                    lastCommunication, timeBetweenDataShouldArrive, dataCanBeLateTolerance);
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.OFFLINE.COMMUNICATION_ERROR,
                     "Check connection cable and afterwards disable and enable this thing to make it work again");
             // in case someone has pulled the plug, we dispose ourselves and the user has to deactivate/activate the
             // thing once the cable is plugged in again
             dispose();
         } else {
             logger.trace("Check Alive timer: All OK: lastCommunication={}, interval={}, tollerance={}",
-                    lastCommunication, timeBetweenDataShouldArrive, dataCanBeLateTollerance);
+                    lastCommunication, timeBetweenDataShouldArrive, dataCanBeLateTolerance);
         }
     }
 

diff --git a/...ain/java/org/openhab/binding/novafinedust/internal/sds011protocol/SDS011Communicator.java b/...ain/java/org/openhab/binding/novafinedust/internal/sds011protocol/SDS011Communicator.java
@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.TooManyListenersException;
 
-import org.apache.commons.io.IOUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.smarthome.io.transport.serial.PortInUseException;
@@ -253,7 +252,7 @@ public void serialEvent(SerialPortEvent event) {
                 reply = readReply();
                 logger.debug("Got data from sensor: {}", reply);
             } catch (IOException e) {
-                logger.error("Could not read available data from the serial port", e);
+                logger.warn("Could not read available data from the serial port", e);
             }
             if (reply instanceof SensorMeasuredDataReply) {
                 SensorMeasuredDataReply sensorData = (SensorMeasuredDataReply) reply;
@@ -281,7 +280,17 @@ public void dispose() {
                 serialPort = null;
             }
         }
-        IOUtils.closeQuietly(inputStream);
-        IOUtils.closeQuietly(outputStream);
+
+        try {
+            inputStream.close();
+        } catch (IOException e) {
+            logger.debug("Error while closing the input stream: {}", e.getMessage());
+        }
+
+        try {
+            outputStream.close();
+        } catch (IOException e) {
+            logger.debug("Error while closing the output stream: {}", e.getMessage());
+        }
     }
 }