Bumped log4j version for testing

Added `isConnected()` method for al master facade classes #103

RELEASE_NOTES.md

@@ -219,3 +219,5 @@ _(**NOT BACKWARDS COMPATIBLE**)_
 * Upgraded to jSeralcomm 2.6.2 that contains fix for [jSerialComm #277](https://github.com/Fazecast/jSerialComm/issues/277)
 * Added some code cleanups as suggested by Sonar
 * Fixed issue where slave listeners (TCP/UDP/Serial) fail silently if they cannot bind to a port
+* Bumped log4j version for testing
+* Added `isConnected()` method for al master facade classes #103

pom.xml

@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.3</version>
+            <version>2.13.2</version>
             <scope>test</scope>
         </dependency>
 

src/main/java/com/ghgande/j2mod/modbus/facade/AbstractModbusMaster.java

@@ -550,4 +550,11 @@ public synchronized void setCheckingValidity(boolean b) {
      */
     public abstract AbstractModbusTransport getTransport();
 
+    /**
+     * Returns true if the master is connected
+     *
+     * @return True if connected
+     */
+    public abstract boolean isConnected();
+
 }

src/main/java/com/ghgande/j2mod/modbus/facade/ModbusSerialMaster.java

@@ -122,4 +122,9 @@ public synchronized void setTimeout(int timeout) {
     public AbstractModbusTransport getTransport() {
         return connection == null ? null : connection.getModbusTransport();
     }
+
+    @Override
+    public boolean isConnected() {
+        return connection != null && connection.isOpen();
+    }
 }

src/main/java/com/ghgande/j2mod/modbus/facade/ModbusTCPMaster.java

@@ -34,7 +34,7 @@ public class ModbusTCPMaster extends AbstractModbusMaster {
 
     private final TCPMasterConnection connection;
     private boolean reconnecting = false;
-    private boolean useRtuOverTcp = false;
+    private boolean useRtuOverTcp;
 
     /**
      * Constructs a new master facade instance for communication
@@ -189,4 +189,9 @@ public synchronized void setTimeout(int timeout) {
     public AbstractModbusTransport getTransport() {
         return connection == null ? null : connection.getModbusTransport();
     }
+
+    @Override
+    public boolean isConnected() {
+        return connection != null && connection.isConnected();
+    }
 }

src/main/java/com/ghgande/j2mod/modbus/facade/ModbusUDPMaster.java

@@ -116,4 +116,9 @@ public synchronized void setTimeout(int timeout) {
     public AbstractModbusTransport getTransport() {
         return connection == null ? null : connection.getModbusTransport();
     }
+
+    @Override
+    public boolean isConnected() {
+        return connection != null && connection.isConnected();
+    }
 }

src/test/java/com/ghgande/j2mod/modbus/TestModbusSerialRTUMasterRead.java

@@ -228,6 +228,11 @@ public void testCallback() {
         ((ModbusSerialTransport) master.getTransport()).removeListener(eventListener);
     }
 
+    @Test
+    public void testIsConnected() {
+        assertTrue("Connected to serial master", master.isConnected());
+    }
+
     private class EventListener extends AbstractSerialTransportListener {
         int step;
 
@@ -269,5 +274,4 @@ public void afterResponseRead(AbstractSerialConnection port, ModbusResponse res)
             step++;
         }
     }
-
 }

src/test/java/com/ghgande/j2mod/modbus/TestModbusTCPMasterRead.java

@@ -171,7 +171,6 @@ public void testBadUnitIdRequest() {
         }
     }
 
-
     @Test
     public void testReadDiscreteExtremeRequest() {
         try {
@@ -182,4 +181,9 @@ public void testReadDiscreteExtremeRequest() {
         }
     }
 
+    @Test
+    public void testIsConnected() {
+        assertTrue("Connected to TCP master", master.isConnected());
+    }
+
 }

src/test/java/com/ghgande/j2mod/modbus/TestModbusUDPMasterRead.java

@@ -101,4 +101,9 @@ public void testMasterReadMultipleHoldingRegisters() {
         assertEquals("Failed to read multiple holding register 5 length 5", 4444, res.getRegisterValue(4));
     }
 
+    @Test
+    public void testIsConnected() {
+        assertTrue("Connected to UDP master", master.isConnected());
+    }
+
 }