[IO-635] Add org.apache.commons.io.IOUtils.close(Closeable).

Author: Gary Gregory

src/changes/changes.xml

@@ -158,6 +158,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action issue="IO-634" dev="ggregory" type="update" due-to="Václav Haisman, Bruno P. Kinoshita, Gary Gregory">
         Make getCause synchronized and use a Deque instead of a Stack #64.
       </action>
+      <action issue="IO-635" dev="ggregory" type="add" due-to="Gary Gregory">
+        Add org.apache.commons.io.IOUtils.close(Closeable).
+      </action>
     </release>
 
     <release version="2.6" date="2017-10-15" description="Java 7 required, Java 9 supported.">

src/main/java/org/apache/commons/io/IOUtils.java

@@ -301,18 +301,6 @@ public static BufferedWriter buffer(final Writer writer, final int size) {
         return writer instanceof BufferedWriter ? (BufferedWriter) writer : new BufferedWriter(writer, size);
     }
 
-    /**
-     * Closes a URLConnection.
-     *
-     * @param conn the connection to close.
-     * @since 2.4
-     */
-    public static void close(final URLConnection conn) {
-        if (conn instanceof HttpURLConnection) {
-            ((HttpURLConnection) conn).disconnect();
-        }
-    }
-
     /**
      * Closes a <code>Closeable</code> unconditionally.
      * <p>
@@ -355,14 +343,37 @@ public static void close(final URLConnection conn) {
     @Deprecated
     public static void closeQuietly(final Closeable closeable) {
         try {
-            if (closeable != null) {
-                closeable.close();
-            }
+            close(closeable);
         } catch (final IOException ioe) {
             // ignore
         }
     }
 
+    /**
+     * Closes the given {@link Closeable} as a null-safe operation.
+     *
+     * @param closeable The resource to close, may be null.
+     * @throws IOException if an I/O error occurs.
+     * @since 2.7
+     */
+    public static void close(final Closeable closeable) throws IOException {
+        if (closeable != null) {
+            closeable.close();
+        }
+    }
+
+    /**
+     * Closes a URLConnection.
+     *
+     * @param conn the connection to close.
+     * @since 2.4
+     */
+    public static void close(final URLConnection conn) {
+        if (conn instanceof HttpURLConnection) {
+            ((HttpURLConnection) conn).disconnect();
+        }
+    }
+
     /**
      * Closes a <code>Closeable</code> unconditionally.
      * <p>
@@ -546,13 +557,7 @@ public static void closeQuietly(final Reader input) {
      */
     @Deprecated
     public static void closeQuietly(final Selector selector) {
-        if (selector != null) {
-            try {
-                selector.close();
-            } catch (final IOException ioe) {
-                // ignored
-            }
-        }
+        closeQuietly((Closeable) selector);
     }
 
     /**
@@ -575,22 +580,16 @@ public static void closeQuietly(final Selector selector) {
      *   }
      * </pre>
      *
-     * @param sock the ServerSocket to close, may be null or already closed
+     * @param serverSocket the ServerSocket to close, may be null or already closed
      * @since 2.2
      *
      * @deprecated As of 2.6 removed without replacement. Please use the try-with-resources statement or handle
      * suppressed exceptions manually.
      * @see Throwable#addSuppressed(java.lang.Throwable)
      */
     @Deprecated
-    public static void closeQuietly(final ServerSocket sock) {
-        if (sock != null) {
-            try {
-                sock.close();
-            } catch (final IOException ioe) {
-                // ignored
-            }
-        }
+    public static void closeQuietly(final ServerSocket serverSocket) {
+        closeQuietly((Closeable) serverSocket);
     }
 
     /**
@@ -613,22 +612,16 @@ public static void closeQuietly(final ServerSocket sock) {
      *   }
      * </pre>
      *
-     * @param sock the Socket to close, may be null or already closed
+     * @param socket the Socket to close, may be null or already closed
      * @since 2.0
      *
      * @deprecated As of 2.6 removed without replacement. Please use the try-with-resources statement or handle
      * suppressed exceptions manually.
      * @see Throwable#addSuppressed(java.lang.Throwable)
      */
     @Deprecated
-    public static void closeQuietly(final Socket sock) {
-        if (sock != null) {
-            try {
-                sock.close();
-            } catch (final IOException ioe) {
-                // ignored
-            }
-        }
+    public static void closeQuietly(final Socket socket) {
+        closeQuietly((Closeable) socket);
     }
 
     /**