[modbus] Improve error message if data thing is configured for readin…

…g but not connected to a polling bridge. (openhab#16054) Signed-off-by: Markus Minichmayr <markus@minichmayr.net> Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
austvik · Mar 27, 2024 · 311b7b5 · 311b7b5
1 parent 245825d
commit 311b7b5
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java b/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
@@ -423,8 +423,7 @@ public synchronized void initialize() {
                 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 synchronized void initialize() {
                 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 @@ private void validateAndParseReadParameters(ModbusDataConfiguration config) thro
         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);
             }
         }