[modbus] Correct exception type in implementation. (openhab#8218)

Interface remains the same. Signed-off-by: Sami Salonen <[email protected]>
markus7017 · Sep 18, 2020 · 244221c · 244221c
1 parent 295fcee
commit 244221c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/.../java/org/openhab/binding/modbus/internal/handler/AbstractModbusEndpointThingHandler.java b/.../java/org/openhab/binding/modbus/internal/handler/AbstractModbusEndpointThingHandler.java
@@ -20,6 +20,7 @@
 import org.eclipse.smarthome.core.thing.ThingStatusDetail;
 import org.eclipse.smarthome.core.thing.binding.BaseBridgeHandler;
 import org.eclipse.smarthome.core.types.Command;
+import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
 import org.openhab.binding.modbus.handler.ModbusEndpointThingHandler;
 import org.openhab.binding.modbus.internal.ModbusConfigurationException;
 import org.openhab.io.transport.modbus.ModbusCommunicationInterface;
@@ -115,7 +116,7 @@ public E getEndpoint() {
     }
 
     @Override
-    public abstract int getSlaveId();
+    public abstract int getSlaveId() throws EndpointNotInitializedException;
 
     /**
      * Must be overriden by subclasses to initialize config, endpoint, and poolConfiguration

diff --git a/...s/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusSerialThingHandler.java b/...s/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusSerialThingHandler.java
@@ -21,6 +21,7 @@
 import org.eclipse.smarthome.core.thing.ThingUID;
 import org.eclipse.smarthome.core.thing.binding.ThingHandlerService;
 import org.openhab.binding.modbus.discovery.internal.ModbusEndpointDiscoveryService;
+import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
 import org.openhab.binding.modbus.internal.ModbusConfigurationException;
 import org.openhab.binding.modbus.internal.config.ModbusSerialConfiguration;
 import org.openhab.io.transport.modbus.ModbusManager;
@@ -94,10 +95,10 @@ protected String formatConflictingParameterError() {
     }
 
     @Override
-    public int getSlaveId() {
+    public int getSlaveId() throws EndpointNotInitializedException {
         ModbusSerialConfiguration config = this.config;
         if (config == null) {
-            throw new IllegalStateException("Poller not configured, but slave id is queried!");
+            throw new EndpointNotInitializedException();
         }
         return config.getId();
     }

diff --git a/...dbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusTcpThingHandler.java b/...dbus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusTcpThingHandler.java
@@ -21,6 +21,7 @@
 import org.eclipse.smarthome.core.thing.ThingUID;
 import org.eclipse.smarthome.core.thing.binding.ThingHandlerService;
 import org.openhab.binding.modbus.discovery.internal.ModbusEndpointDiscoveryService;
+import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
 import org.openhab.binding.modbus.internal.ModbusConfigurationException;
 import org.openhab.binding.modbus.internal.config.ModbusTcpConfiguration;
 import org.openhab.io.transport.modbus.ModbusManager;
@@ -72,10 +73,10 @@ protected String formatConflictingParameterError() {
     }
 
     @Override
-    public int getSlaveId() {
+    public int getSlaveId() throws EndpointNotInitializedException {
         ModbusTcpConfiguration localConfig = config;
         if (localConfig == null) {
-            throw new IllegalStateException("Poller not configured, but slave id is queried!");
+            throw new EndpointNotInitializedException();
         }
         return localConfig.getId();
     }

diff --git a/...ng.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java b/...ng.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java
@@ -61,6 +61,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
 import org.openhab.binding.modbus.handler.ModbusPollerThingHandler;
 import org.openhab.binding.modbus.internal.handler.ModbusDataThingHandler;
 import org.openhab.binding.modbus.internal.handler.ModbusTcpThingHandler;
@@ -163,7 +164,12 @@ private Bridge createTcpMock() {
         tcpBridge.setStatusInfo(new ThingStatusInfo(ThingStatus.ONLINE, ThingStatusDetail.NONE, ""));
         tcpBridge.setHandler(tcpThingHandler);
         doReturn(comms).when(tcpThingHandler).getCommunicationInterface();
-        doReturn(0).when(tcpThingHandler).getSlaveId();
+        try {
+            doReturn(0).when(tcpThingHandler).getSlaveId();
+        } catch (EndpointNotInitializedException e) {
+            // not raised -- we are mocking return value only, not actually calling the method
+            throw new IllegalStateException();
+        }
         tcpThingHandler.initialize();
         assertThat(tcpBridge.getStatus(), is(equalTo(ThingStatus.ONLINE)));
         return tcpBridge;

diff --git a/...odbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusTcpThingHandlerTest.java b/...odbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusTcpThingHandlerTest.java
@@ -28,6 +28,7 @@
 import org.mockito.InOrder;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
 import org.openhab.binding.modbus.internal.ModbusBindingConstantsInternal;
 import org.openhab.binding.modbus.internal.handler.ModbusTcpThingHandler;
 import org.openhab.io.transport.modbus.endpoint.EndpointPoolConfiguration;
@@ -46,7 +47,7 @@ private static BridgeBuilder createTcpThingBuilder(String id) {
     }
 
     @Test
-    public void testInitializeAndSlaveEndpoint() {
+    public void testInitializeAndSlaveEndpoint() throws EndpointNotInitializedException {
         Configuration thingConfig = new Configuration();
         thingConfig.put("host", "thisishost");
         thingConfig.put("port", 44);