Reuse IOUtils

Author: garydgregory

commons-vfs2/src/main/java/org/apache/commons/vfs2/cache/LRUFilesCache.java

@@ -25,12 +25,12 @@
 
 import org.apache.commons.collections4.map.AbstractLinkedMap;
 import org.apache.commons.collections4.map.LRUMap;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.vfs2.FileName;
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.FileSystem;
-import org.apache.commons.vfs2.FileSystemException;
 import org.apache.commons.vfs2.VfsLog;
 import org.apache.commons.vfs2.util.Messages;
 
@@ -77,18 +77,12 @@ protected boolean removeLRU(final AbstractLinkedMap.LinkEntry<FileName, FileObje
 
                 // System.err.println(">>> " + size() + " removeLRU:" + linkEntry.getKey().toString());
                 if (super.removeLRU(linkEntry)) {
-                    try {
-                        // force detach
-                        fileObject.close();
-                    } catch (final FileSystemException e) {
-                        VfsLog.warn(getLogger(), log, Messages.getString("vfs.impl/LRUFilesCache-remove-ex.warn"), e);
-                    }
-
+                    // force detach
+                    IOUtils.closeQuietly(fileObject, e -> VfsLog.warn(getLogger(), log, Messages.getString("vfs.impl/LRUFilesCache-remove-ex.warn"), e));
                     final Map<?, ?> files = fileSystemCache.get(filesystem);
                     if (files.isEmpty()) {
                         fileSystemCache.remove(filesystem);
                     }
-
                     return true;
                 }
 

commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/StandardFileSystemManager.java

@@ -28,6 +28,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.vfs2.FileSystemException;
@@ -207,13 +208,7 @@ private void configure(final URL configUri) throws FileSystemException {
         } catch (final Exception e) {
             throw new FileSystemException("vfs.impl/load-config.error", configUri.toString(), e);
         } finally {
-            if (configStream != null) {
-                try {
-                    configStream.close();
-                } catch (final IOException e) {
-                    getLogger().warn(e.getLocalizedMessage(), e);
-                }
-            }
+            IOUtils.closeQuietly(configStream, e -> getLogger().warn(e.getLocalizedMessage(), e));
         }
     }
 

commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java

@@ -33,8 +33,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.function.Uncheck;
 import org.apache.commons.vfs2.Capability;
 import org.apache.commons.vfs2.FileContent;
@@ -220,28 +222,21 @@ protected void childrenChanged(final FileName childName, final FileType newType)
      */
     @Override
     public void close() throws FileSystemException {
-        FileSystemException exc = null;
-
+        AtomicReference<Exception> ref = new AtomicReference<>();
         synchronized (fileSystem) {
             // Close the content
-            if (content != null) {
-                try {
-                    content.close();
-                    content = null;
-                } catch (final FileSystemException e) {
-                    exc = e;
-                }
+            IOUtils.closeQuietly(content, ref::set);
+            if (ref.get() != null) {
+                content = null;
             }
-
             // Detach from the file
             try {
                 detach();
             } catch (final Exception e) {
-                exc = new FileSystemException("vfs.provider/close.error", fileName, e);
+                ref.set(e);
             }
-
-            if (exc != null) {
-                throw exc;
+            if (ref.get() != null) {
+                throw new FileSystemException("vfs.provider/close.error", fileName, ref.get());
             }
         }
     }

commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpRandomAccessContent.java

@@ -20,6 +20,7 @@
 import java.io.FilterInputStream;
 import java.io.IOException;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.vfs2.FileSystemException;
 import org.apache.commons.vfs2.provider.AbstractRandomAccessStreamContent;
 import org.apache.commons.vfs2.util.RandomAccessMode;
@@ -116,14 +117,10 @@ public void seek(final long pos) throws IOException {
             // no change
             return;
         }
-
         if (pos < 0) {
             throw new FileSystemException("vfs.provider/random-access-invalid-position.error", Long.valueOf(pos));
         }
-        if (dis != null) {
-            close();
-        }
-
+        IOUtils.close(dis);
         filePointer = pos;
     }
 }

commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java

@@ -27,6 +27,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.vfs2.Capability;
@@ -129,10 +130,8 @@ protected ZipFileObject createZipFileObject(final AbstractFileName fileName, fin
     protected void doCloseCommunicationLink() {
         // Release the zip file
         try {
-            if (zipFile != null) {
-                zipFile.close();
-                zipFile = null;
-            }
+            IOUtils.close(zipFile);
+            zipFile = null;
         } catch (final IOException e) {
             // getLogger().warn("vfs.provider.zip/close-zip-file.error :" + file, e);
             VfsLog.warn(getLogger(), LOG, "vfs.provider.zip/close-zip-file.error :" + file, e);

commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java

@@ -31,6 +31,7 @@
 import java.nio.file.Path;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.function.FailableFunction;
@@ -195,11 +196,7 @@ private <T extends Closeable> void testStreamClosedInADifferentThread(final Fail
             final T stream = getStream.apply(file.getContent());
             final AtomicBoolean check = new AtomicBoolean();
             final Thread thread = new Thread(() -> {
-                try {
-                    stream.close();
-                } catch (final IOException exception) {
-                    // ignore
-                }
+                IOUtils.closeQuietly(stream);
                 check.set(true);
             });
             thread.start();

commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java

@@ -32,6 +32,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.vfs2.AllFileSelector;
 import org.apache.commons.vfs2.FileContent;
 import org.apache.commons.vfs2.FileObject;
@@ -121,15 +122,11 @@ public void setUp() throws Exception {
     }
 
     @AfterEach
-    public void tearDown() {
-        for (final Closeable closeable : closeables) {
-            try {
-                closeable.close();
-            } catch (final Exception e) {
-                // ignore
-            }
+    public void tearDown() throws IOException {
+        IOUtils.closeQuietly(closeables);
+        if (manager != null) {
+            manager.close();
         }
-        manager.close();
     }
 
     @Test