[rfxcom] Removed dependency on 'org.apache.commons.io.IOUtils'

Relative to openhab#7722 Signed-off-by: Laurent Garnier <lg.hc@free.fr>
lolodomo · May 22, 2020 · e8ce87b · e8ce87b
1 parent efc84f1
commit e8ce87b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/...com/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComJD2XXConnector.java b/...com/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComJD2XXConnector.java
@@ -14,7 +14,6 @@
 
 import java.io.IOException;
 
-import org.apache.commons.io.IOUtils;
 import org.eclipse.smarthome.core.util.HexUtils;
 import org.openhab.binding.rfxcom.internal.config.RFXComBridgeConfiguration;
 import org.slf4j.Logger;
@@ -77,11 +76,17 @@ public void disconnect() {
 
         if (out != null) {
             logger.debug("Close serial out stream");
-            IOUtils.closeQuietly(out);
+            try {
+                out.close();
+            } catch (IOException e) {
+            }
         }
         if (in != null) {
             logger.debug("Close serial in stream");
-            IOUtils.closeQuietly(in);
+            try {
+                in.close();
+            } catch (IOException e) {
+            }
         }
 
         if (serialPort != null) {

diff --git a/...om/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComSerialConnector.java b/...om/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComSerialConnector.java
@@ -16,7 +16,6 @@
 import java.io.OutputStream;
 import java.util.TooManyListenersException;
 
-import org.apache.commons.io.IOUtils;
 import org.eclipse.smarthome.core.util.HexUtils;
 import org.eclipse.smarthome.io.transport.serial.PortInUseException;
 import org.eclipse.smarthome.io.transport.serial.SerialPort;
@@ -106,11 +105,17 @@ public void disconnect() {
 
         if (out != null) {
             logger.debug("Close serial out stream");
-            IOUtils.closeQuietly(out);
+            try {
+                out.close();
+            } catch (IOException e) {
+            }
         }
         if (in != null) {
             logger.debug("Close serial in stream");
-            IOUtils.closeQuietly(in);
+            try {
+                in.close();
+            } catch (IOException e) {
+            }
         }
 
         if (serialPort != null) {

diff --git a/...fxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComTcpConnector.java b/...fxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComTcpConnector.java
@@ -17,7 +17,6 @@
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 
-import org.apache.commons.io.IOUtils;
 import org.eclipse.smarthome.core.util.HexUtils;
 import org.openhab.binding.rfxcom.internal.config.RFXComBridgeConfiguration;
 import org.slf4j.Logger;
@@ -69,16 +68,25 @@ public void disconnect() {
 
         if (out != null) {
             logger.debug("Close tcp out stream");
-            IOUtils.closeQuietly(out);
+            try {
+                out.close();
+            } catch (IOException e) {
+            }
         }
         if (in != null) {
             logger.debug("Close tcp in stream");
-            IOUtils.closeQuietly(in);
+            try {
+                in.close();
+            } catch (IOException e) {
+            }
         }
 
         if (socket != null) {
             logger.debug("Close socket");
-            IOUtils.closeQuietly(socket);
+            try {
+                socket.close();
+            } catch (IOException e) {
+            }
         }
 
         readerThread = null;