avoid "new File*putStream" constructor
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/81398f69 Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/81398f69 Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/81398f69 Branch: refs/heads/master Commit: 81398f69f131da572f24995d4e43b343ffc737f1 Parents: 58eb1a7 Author: Stefan Bodewig <bode...@apache.org> Authored: Mon May 7 14:09:37 2018 +0200 Committer: Stefan Bodewig <bode...@apache.org> Committed: Mon May 7 14:09:37 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/commons/compress/archivers/Archiver.java | 7 ++++--- .../java/org/apache/commons/compress/archivers/Expander.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-compress/blob/81398f69/src/main/java/org/apache/commons/compress/archivers/Archiver.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/Archiver.java b/src/main/java/org/apache/commons/compress/archivers/Archiver.java index 4e82640..798591e 100644 --- a/src/main/java/org/apache/commons/compress/archivers/Archiver.java +++ b/src/main/java/org/apache/commons/compress/archivers/Archiver.java @@ -29,6 +29,7 @@ import java.io.OutputStream; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.SeekableByteChannel; +import java.nio.file.Files; import java.nio.file.StandardOpenOption; import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile; @@ -98,7 +99,7 @@ public class Archiver { } return; } - try (OutputStream o = new FileOutputStream(target)) { + try (OutputStream o = Files.newOutputStream(target.toPath())) { create(format, o, directory, filter); } } @@ -214,7 +215,7 @@ public class Archiver { public void accept(File source, ArchiveEntry e) throws IOException { target.putArchiveEntry(e); if (!e.isDirectory()) { - try (InputStream in = new BufferedInputStream(new FileInputStream(source))) { + try (InputStream in = new BufferedInputStream(Files.newInputStream(source.toPath()))) { IOUtils.copy(in, target); } } @@ -261,7 +262,7 @@ public class Archiver { final byte[] buffer = new byte[8024]; int n = 0; long count = 0; - try (InputStream in = new BufferedInputStream(new FileInputStream(source))) { + try (InputStream in = new BufferedInputStream(Files.newInputStream(source.toPath()))) { while (-1 != (n = in.read(buffer))) { target.write(buffer, 0, n); count += n; http://git-wip-us.apache.org/repos/asf/commons-compress/blob/81398f69/src/main/java/org/apache/commons/compress/archivers/Expander.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/compress/archivers/Expander.java b/src/main/java/org/apache/commons/compress/archivers/Expander.java index 82b958e..f726de7 100644 --- a/src/main/java/org/apache/commons/compress/archivers/Expander.java +++ b/src/main/java/org/apache/commons/compress/archivers/Expander.java @@ -28,6 +28,7 @@ import java.io.OutputStream; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.SeekableByteChannel; +import java.nio.file.Files; import java.nio.file.StandardOpenOption; import java.util.Enumeration; @@ -110,7 +111,7 @@ public class Expander { public void expand(File archive, File targetDirectory, ArchiveEntryFilter filter) throws IOException, ArchiveException { String format = null; - try (InputStream i = new BufferedInputStream(new FileInputStream(archive))) { + try (InputStream i = new BufferedInputStream(Files.newInputStream(archive.toPath()))) { format = new ArchiveStreamFactory().detect(i); } expand(format, archive, targetDirectory, filter); @@ -136,7 +137,7 @@ public class Expander { } return; } - try (InputStream i = new BufferedInputStream(new FileInputStream(archive))) { + try (InputStream i = new BufferedInputStream(Files.newInputStream(archive.toPath()))) { expand(format, i, targetDirectory, filter); } } @@ -396,7 +397,7 @@ public class Expander { f.mkdirs(); } else { f.getParentFile().mkdirs(); - try (OutputStream o = new FileOutputStream(f)) { + try (OutputStream o = Files.newOutputStream(f.toPath())) { writer.writeEntryDataTo(nextEntry, o); } }
