Implementation of refresh command and better multi-thread handling

Signed-off-by: Konstantin Polihronov <[email protected]>
openhab · Nov 25, 2023 · 9756bbf · 9756bbf
1 parent 24f4234
commit 9756bbf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/...binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxBindingConstants.java b/...binding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxBindingConstants.java
@@ -26,7 +26,7 @@
 @NonNullByDefault
 public class SolaxBindingConstants {
 
-    private static final String BINDING_ID = "solax";
+    protected static final String BINDING_ID = "solax";
     private static final String THING_LOCAL_CONNECT_INVERTER_ID = "local-connect-inverter";
 
     // List of all Thing Type UIDs

diff --git a/...nding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxLocalAccessHandler.java b/...nding.solax/src/main/java/org/openhab/binding/solax/internal/SolaxLocalAccessHandler.java
@@ -19,6 +19,7 @@
 import java.util.Set;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 
 import javax.measure.Quantity;
 import javax.measure.Unit;
@@ -42,6 +43,7 @@
 import org.openhab.core.thing.ThingStatusDetail;
 import org.openhab.core.thing.binding.BaseThingHandler;
 import org.openhab.core.types.Command;
+import org.openhab.core.types.RefreshType;
 import org.openhab.core.types.UnDefType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,6 +71,8 @@ public class SolaxLocalAccessHandler extends BaseThingHandler {
 
     private final Set<String> unsupportedExistingChannels = new HashSet<String>();
 
+    private final ReentrantLock retrieveDataCallLock = new ReentrantLock();
+
     public SolaxLocalAccessHandler(Thing thing) {
         super(thing);
     }
@@ -89,18 +93,26 @@ public void initialize() {
 
     private void retrieveData() {
         try {
-            String rawJsonData = localHttpConnector.retrieveData();
-            logger.debug("Raw data retrieved = {}", rawJsonData);
-
-            if (rawJsonData != null && !rawJsonData.isEmpty()) {
-                updateFromData(rawJsonData);
+            if (retrieveDataCallLock.tryLock()) {
+                String rawJsonData = localHttpConnector.retrieveData();
+                logger.debug("Raw data retrieved = {}", rawJsonData);
+
+                if (rawJsonData != null && !rawJsonData.isEmpty()) {
+                    updateFromData(rawJsonData);
+                } else {
+                    updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
+                            SolaxBindingConstants.I18N_KEY_OFFLINE_COMMUNICATION_ERROR_JSON_CANNOT_BE_RETRIEVED);
+                }
             } else {
-                updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
-                        SolaxBindingConstants.I18N_KEY_OFFLINE_COMMUNICATION_ERROR_JSON_CANNOT_BE_RETRIEVED);
+                logger.debug("Unable to retrieve data because a request is already in progress.");
             }
         } catch (IOException e) {
             logger.debug("Exception received while attempting to retrieve data via HTTP", e);
             updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage());
+        } finally {
+            if (retrieveDataCallLock.isHeldByCurrentThread()) {
+                retrieveDataCallLock.unlock();
+            }
         }
     }
 
@@ -283,7 +295,11 @@ private void logRemovedChannels(List<Channel> channelsToRemove) {
 
     @Override
     public void handleCommand(ChannelUID channelUID, Command command) {
-        // Nothing to do here as of now. Maybe implement a REFRESH command in the future.
+        if (command instanceof RefreshType) {
+            scheduler.execute(this::retrieveData);
+        } else {
+            logger.debug("Binding {} only supports refresh command", SolaxBindingConstants.BINDING_ID);
+        }
     }
 
     @Override