From 52b94bff62274018e214e7f0a5e9a85787f09999 Mon Sep 17 00:00:00 2001
From: lolodomo <lg.hc@free.fr>
Date: Sat, 23 May 2020 13:09:33 +0200
Subject: [PATCH] [rfxcom] Removed dependency on
 'org.apache.commons.io.IOUtils' (#7729)

Related to #7722

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
---
 .../connector/RFXComJD2XXConnector.java       | 15 +++++++++++----
 .../connector/RFXComSerialConnector.java      | 13 ++++++++++---
 .../connector/RFXComTcpConnector.java         | 19 +++++++++++++++----
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComJD2XXConnector.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComJD2XXConnector.java
index fd44f021379cc..2caa0a91296cb 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComJD2XXConnector.java
+++ b/bundles/org.openhab.binding.rfxcom/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,19 @@ public void disconnect() {
 
         if (out != null) {
             logger.debug("Close serial out stream");
-            IOUtils.closeQuietly(out);
+            try {
+                out.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the out stream: {}", e.getMessage());
+            }
         }
         if (in != null) {
             logger.debug("Close serial in stream");
-            IOUtils.closeQuietly(in);
+            try {
+                in.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the in stream: {}", e.getMessage());
+            }
         }
 
         if (serialPort != null) {
@@ -89,7 +96,7 @@ public void disconnect() {
             try {
                 serialPort.close();
             } catch (IOException e) {
-                logger.warn("Serial port closing error", e);
+                logger.debug("Serial port closing error: {}", e.getMessage());
             }
         }
 
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComSerialConnector.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComSerialConnector.java
index 5dcc7745713d9..07191a61fd495 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComSerialConnector.java
+++ b/bundles/org.openhab.binding.rfxcom/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,19 @@ public void disconnect() {
 
         if (out != null) {
             logger.debug("Close serial out stream");
-            IOUtils.closeQuietly(out);
+            try {
+                out.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the out stream: {}", e.getMessage());
+            }
         }
         if (in != null) {
             logger.debug("Close serial in stream");
-            IOUtils.closeQuietly(in);
+            try {
+                in.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the in stream: {}", e.getMessage());
+            }
         }
 
         if (serialPort != null) {
diff --git a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComTcpConnector.java b/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComTcpConnector.java
index 2c8a71eedef59..8e02cc384d4d3 100644
--- a/bundles/org.openhab.binding.rfxcom/src/main/java/org/openhab/binding/rfxcom/internal/connector/RFXComTcpConnector.java
+++ b/bundles/org.openhab.binding.rfxcom/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,28 @@ public void disconnect() {
 
         if (out != null) {
             logger.debug("Close tcp out stream");
-            IOUtils.closeQuietly(out);
+            try {
+                out.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the out stream: {}", e.getMessage());
+            }
         }
         if (in != null) {
             logger.debug("Close tcp in stream");
-            IOUtils.closeQuietly(in);
+            try {
+                in.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the in stream: {}", e.getMessage());
+            }
         }
 
         if (socket != null) {
             logger.debug("Close socket");
-            IOUtils.closeQuietly(socket);
+            try {
+                socket.close();
+            } catch (IOException e) {
+                logger.debug("Error while closing the socket: {}", e.getMessage());
+            }
         }
 
         readerThread = null;