[ihc] Changed pulse command to use scheduling (#5417)

Also changed couple of list iterators to streams. Signed-off-by: Pauli Anttila <[email protected]>
openhab · Apr 9, 2019 · a1bbfc6 · a1bbfc6
1 parent 9dbae99
commit a1bbfc6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 36 deletions.
diff --git a/...penhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java b/...penhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/handler/IhcHandler.java
@@ -428,25 +428,21 @@ private void sendPulseCommand(ChannelUID channelUID, ChannelParams params, WSRes
             // set resource to ON
             logger.debug("Update resource value (inverted output={}): {}", params.isInverted(), valOn);
             if (updateResource(valOn)) {
-                scheduler.submit(() -> {
-                    // sleep a while
-                    try {
-                        logger.debug("Sleeping: {}ms", pulseWidth);
-                        Thread.sleep(pulseWidth);
-                    } catch (InterruptedException e) {
-                        // do nothing
-                    }
-                    // set resource back to OFF
-
-                    logger.debug("Update resource value (inverted output={}): {}", params.isInverted(), valOff);
-                    try {
-                        if (!updateResource(valOff)) {
-                            logger.warn("Channel {} update to resource '{}' failed.", channelUID, valOff);
+                logger.debug("Sleeping: {}ms", pulseWidth);
+                scheduler.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        // set resource back to OFF
+                        logger.debug("Update resource value (inverted output={}): {}", params.isInverted(), valOff);
+                        try {
+                            if (!updateResource(valOff)) {
+                                logger.warn("Channel {} update to resource '{}' failed.", channelUID, valOff);
+                            }
+                        } catch (IhcExecption e) {
+                            logger.error("Can't update channel '{}' value, cause ", channelUID, e.getMessage(), e);
                         }
-                    } catch (IhcExecption e) {
-                        logger.error("Can't update channel '{}' value, cause ", channelUID, e.getMessage(), e);
                     }
-                });
+                }, pulseWidth, TimeUnit.MILLISECONDS);
             } else {
                 logger.warn("Channel {} update failed.", channelUID);
             }

diff --git a/.../org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcClient.java b/.../org.openhab.binding.ihc/src/main/java/org/openhab/binding/ihc/internal/ws/IhcClient.java
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -536,38 +535,32 @@ private void mysleep(long milli) {
     }
 
     private void sendErrorEvent(IhcExecption err) {
-        Iterator<IhcEventListener> iterator = eventListeners.iterator();
-
-        while (iterator.hasNext()) {
+        eventListeners.forEach(listener -> {
             try {
-                iterator.next().errorOccured(err);
+                listener.errorOccured(err);
             } catch (RuntimeException e) {
-                logger.debug("Event listener invoking error. ", e);
+                logger.debug("Event listener invoking error.", e);
             }
-        }
+        });
     }
 
     private void sendControllerStateUpdateEvent(WSControllerState state) {
-        Iterator<IhcEventListener> iterator = eventListeners.iterator();
-
-        while (iterator.hasNext()) {
+        eventListeners.forEach(listener -> {
             try {
-                iterator.next().statusUpdateReceived(state);
+                listener.statusUpdateReceived(state);
             } catch (RuntimeException e) {
-                logger.debug("Event listener invoking error. ", e);
+                logger.debug("Event listener invoking error.", e);
             }
-        }
+        });
     }
 
     private void sendResourceValueUpdateEvent(WSResourceValue value) {
-        Iterator<IhcEventListener> iterator = eventListeners.iterator();
-
-        while (iterator.hasNext()) {
+        eventListeners.forEach(listener -> {
             try {
-                iterator.next().resourceValueUpdateReceived(value);
+                listener.resourceValueUpdateReceived(value);
             } catch (RuntimeException e) {
-                logger.debug("Event listener invoking error. ", e);
+                logger.debug("Event listener invoking error.", e);
             }
-        }
+        });
     }
 }