From d35e96ab3fd546a5d1a590a18cd73a209cb25745 Mon Sep 17 00:00:00 2001 From: Fabian Wolter Date: Mon, 28 Feb 2022 22:53:33 +0100 Subject: [PATCH] [hdpowerview] Remove unnecessary init checks and fix Thing status detail (#12331) * [hdpowerview] Remove unnecessary init checks and fix Thing status detail Signed-off-by: Fabian Wolter --- .../internal/handler/HDPowerViewHubHandler.java | 2 +- .../internal/handler/HDPowerViewRepeaterHandler.java | 11 +---------- .../internal/handler/HDPowerViewShadeHandler.java | 12 ++---------- .../resources/OH-INF/i18n/hdpowerview.properties | 1 - 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java index 477ebdb734..18014108b3 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java @@ -311,7 +311,7 @@ public class HDPowerViewHubHandler extends BaseBridgeHandler { // exceptions are logged in HDPowerViewWebTargets } catch (HubException e) { logger.warn("Error connecting to bridge: {}", e.getMessage()); - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_OFFLINE, e.getMessage()); + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR, e.getMessage()); } } diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewRepeaterHandler.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewRepeaterHandler.java index a3a0cf35fe..498a147ee7 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewRepeaterHandler.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewRepeaterHandler.java @@ -67,18 +67,9 @@ public class HDPowerViewRepeaterHandler extends AbstractHubbedThingHandler { public void initialize() { repeaterId = getConfigAs(HDPowerViewRepeaterConfiguration.class).id; logger.debug("Initializing repeater handler for repeater {}", repeaterId); - if (repeaterId <= 0) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, - "@text/offline.conf-error.invalid-id"); - return; - } Bridge bridge = getBridge(); if (bridge == null) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_UNINITIALIZED); - return; - } - if (!(bridge.getHandler() instanceof HDPowerViewHubHandler)) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_UNINITIALIZED, + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "@text/offline.conf-error.invalid-bridge-handler"); return; } diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java index 5b0cb829a5..2c072811c6 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewShadeHandler.java @@ -94,21 +94,13 @@ public class HDPowerViewShadeHandler extends AbstractHubbedThingHandler { isDisposing = false; shadeId = getConfigAs(HDPowerViewShadeConfiguration.class).id; logger.debug("Initializing shade handler for shade {}", shadeId); - if (shadeId <= 0) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, - "@text/offline.conf-error.invalid-id"); - return; - } Bridge bridge = getBridge(); if (bridge == null) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_UNINITIALIZED); - return; - } - if (!(bridge.getHandler() instanceof HDPowerViewHubHandler)) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.BRIDGE_UNINITIALIZED, + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "@text/offline.conf-error.invalid-bridge-handler"); return; } + updateStatus(ThingStatus.UNKNOWN); } diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties index e72a760ba8..7623d43461 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties +++ b/bundles/org.openhab.binding.hdpowerview/src/main/resources/OH-INF/i18n/hdpowerview.properties @@ -52,7 +52,6 @@ channel-type.hdpowerview.shade-vane.description = The opening of the slats in th # thing status descriptions offline.conf-error.no-host-address = Host address must be set -offline.conf-error.invalid-id = Configuration 'id' not a valid integer offline.conf-error.invalid-bridge-handler = Invalid bridge handler offline.gone.shade-unknown-to-hub = Shade is unknown to Hub -- 2.47.3