From: Markus Minichmayr <markus@tapkey.com>
Date: Thu, 14 Dec 2023 22:25:25 +0000 (+0100)
Subject: [modbus] Improve error message if data thing is configured for reading but not connec... 
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=03b7b1dbac6130ab135e0c75b3daf03ab17a3076;p=openhab-addons.git

[modbus] Improve error message if data thing is configured for reading but not connected to a polling bridge. (#16054)

Signed-off-by: Markus Minichmayr <markus@minichmayr.net>
---

diff --git a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
index 8eb720b40c..f81fc52171 100644
--- a/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
+++ b/bundles/org.openhab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
@@ -423,8 +423,7 @@ public class ModbusDataThingHandler extends BaseThingHandler {
                 childOfEndpoint = true;
                 functionCode = null;
                 readRequest = null;
-            } else {
-                ModbusPollerThingHandler localPollerHandler = (ModbusPollerThingHandler) bridgeHandler;
+            } else if (bridgeHandler instanceof ModbusPollerThingHandler localPollerHandler) {
                 pollerHandler = localPollerHandler;
                 ModbusReadRequestBlueprint localReadRequest = localPollerHandler.getRequest();
                 if (localReadRequest == null) {
@@ -441,7 +440,12 @@ public class ModbusDataThingHandler extends BaseThingHandler {
                 comms = localPollerHandler.getCommunicationInterface();
                 pollStart = localReadRequest.getReference();
                 childOfEndpoint = false;
+            } else {
+                String errmsg = String.format("Thing %s is connected to an unsupported type of bridge.",
+                        getThing().getUID());
+                throw new ModbusConfigurationException(errmsg);
             }
+
             validateAndParseReadParameters(localConfig);
             validateAndParseWriteParameters(localConfig);
             validateMustReadOrWrite();
@@ -513,8 +517,8 @@ public class ModbusDataThingHandler extends BaseThingHandler {
         if (childOfEndpoint && readRequest == null) {
             if (!readStartMissing || !readValueTypeMissing) {
                 String errmsg = String.format(
-                        "Thing %s readStart=%s, and readValueType=%s were specified even though the data thing is child of endpoint (that is, write-only)!",
-                        getThing().getUID(), config.getReadStart(), config.getReadValueType());
+                        "Thing %s was configured for reading (readStart and/or readValueType specified) but the parent is not a polling bridge. Consider using a bridge of type 'Regular Poll'.",
+                        getThing().getUID());
                 throw new ModbusConfigurationException(errmsg);
             }
         }