[plugwiseha] Fix bug introduced with openhab#12349 (openhab#12366)

* Fix bug introduced with openhab#12349 Signed-off-by: Leo Siepel <leosiepel@gmail.com>
psmedley · Feb 23, 2023 · 9f206ba · 9f206ba
1 parent 1b12ada
commit 9f206ba
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/...n/java/org/openhab/binding/plugwiseha/internal/api/model/dto/ActuatorFunctionalities.java b/...n/java/org/openhab/binding/plugwiseha/internal/api/model/dto/ActuatorFunctionalities.java
@@ -35,8 +35,12 @@ public Optional<Boolean> getRelayLockState() {
                 .map(Boolean::parseBoolean);
     }
 
-    public Optional<String> getRegulationControl() {
-        return this.getFunctionalityThermostat().flatMap(ActuatorFunctionality::getRegulationControl);
+    public String getRegulationControl() {
+        ActuatorFunctionality functionality = this.getFunctionalityThermostat().orElse(null);
+        if (functionality != null) {
+            return functionality.getRegulationControl();
+        }
+        return null;
     }
 
     public Optional<Boolean> getCoolingAllowed() {

diff --git a/...ain/java/org/openhab/binding/plugwiseha/internal/api/model/dto/ActuatorFunctionality.java b/...ain/java/org/openhab/binding/plugwiseha/internal/api/model/dto/ActuatorFunctionality.java
@@ -81,8 +81,8 @@ public ZonedDateTime getUpdatedDate() {
         return updatedDate;
     }
 
-    public Optional<String> getRegulationControl() {
-        return Optional.ofNullable(regulationControl);
+    public String getRegulationControl() {
+        return regulationControl;
     }
 
     public Optional<String> getCoolingAllowed() {

diff --git a/...gwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java b/...gwiseha/src/main/java/org/openhab/binding/plugwiseha/internal/api/model/dto/Location.java
@@ -109,8 +109,11 @@ public Optional<Boolean> getCoolingAllowed() {
         return this.actuatorFunctionalities.getCoolingAllowed();
     }
 
-    public Optional<String> getRegulationControl() {
-        return this.actuatorFunctionalities.getRegulationControl();
+    public String getRegulationControl() {
+        if (this.actuatorFunctionalities != null) {
+            return this.actuatorFunctionalities.getRegulationControl();
+        }
+        return null;
     }
 
     public int applianceCount() {

diff --git a/...rc/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHABridgeHandler.java b/...rc/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHABridgeHandler.java
@@ -175,12 +175,16 @@ private void run() {
         } catch (PlugwiseHAUnauthorizedException | PlugwiseHANotAuthorizedException e) {
             updateStatus(OFFLINE, CONFIGURATION_ERROR, STATUS_DESCRIPTION_INVALID_CREDENTIALS);
         } catch (PlugwiseHACommunicationException e) {
+            this.logger.trace("Bridge encountered an error {}", e.getMessage(), e);
             updateStatus(OFFLINE, COMMUNICATION_ERROR, STATUS_DESCRIPTION_COMMUNICATION_ERROR);
         } catch (PlugwiseHATimeoutException e) {
+            this.logger.trace("Bridge encountered an error {}", e.getMessage(), e);
             updateStatus(OFFLINE, COMMUNICATION_ERROR, STATUS_DESCRIPTION_TIMEOUT);
         } catch (PlugwiseHAException e) {
+            this.logger.trace("Bridge encountered an error {}", e.getMessage(), e);
             updateStatus(OFFLINE, COMMUNICATION_ERROR, e.getMessage());
         } catch (RuntimeException e) {
+            this.logger.trace("Bridge encountered an error {}", e.getMessage(), e);
             updateStatus(OFFLINE, COMMUNICATION_ERROR, e.getMessage());
         }
     }

diff --git a/.../src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAZoneHandler.java b/.../src/main/java/org/openhab/binding/plugwiseha/internal/handler/PlugwiseHAZoneHandler.java
@@ -224,7 +224,10 @@ protected void refreshChannel(Location entity, ChannelUID channelUID) {
                 }
                 break;
             case ZONE_REGULATION_CHANNEL:
-                state = new StringType(entity.getRegulationControl().orElse(null));
+                String value = entity.getRegulationControl();
+                if (value != null) {
+                    state = new StringType(entity.getRegulationControl());
+                }
                 break;
             case ZONE_TEMPERATURE_CHANNEL:
                 if (entity.getTemperature().isPresent()) {